motion-support 0.2.2 → 0.2.3

data/README.md

@@ -317,7 +317,6 @@ Things to do / to decide:
 * Port callbacks.rb
 * Port concern.rb
 * Do we need the `Configurable` module?
-* Do we need the `DescendantsTracker` module?
 * Do we need the `OrderedOptions` class?
 * Some extensions have to be made available for Cocoa classes (`NSArray`, `NSDictionary` etc.), since we want to effectively handle return values from Objective-C methods (they return Cocoa classes). The way to do this is to write a conversion method from Cocoa class to Ruby class and delegate the extension methods in the Cocoa class to the conversion method. See `motion/core_ext/ns_string.rb` for an example.
 * Go through documentation and remove or rewrite things not relevant to RubyMotion, especially examples mentioning Rails components

data/motion/core_ext/ns_string.rb

@@ -7,8 +7,8 @@ class NSString
   
   delegate :at, :blank?, :camelcase, :camelize, :classify, :constantize, :dasherize,
            :deconstantize, :demodulize, :exclude?, :first, :foreign_key, :from, :humanize,
-           :indent, :indent!, :last, :parameterize, :pluralize, :safe_constantize,
-           :singularize, :squish, :squish!, :strip_heredoc, :tableize, :titlecase,
-           :titleize, :to, :truncate, :underscore,
+           :indent, :indent!, :last, :pluralize, :safe_constantize, :singularize,
+           :squish, :squish!, :strip_heredoc, :tableize, :titlecase, :titleize, :to,
+           :truncate, :underscore,
            :to => :to_s
 end

data/motion/core_ext/string/inflections.rb

@@ -132,23 +132,6 @@ class String
     MotionSupport::Inflector.deconstantize(self)
   end
 
-  # Replaces special characters in a string so that it may be used as part of a 'pretty' URL.
-  #
-  #   class Person
-  #     def to_param
-  #       "#{id}-#{name.parameterize}"
-  #     end
-  #   end
-  #
-  #   @person = Person.find(1)
-  #   # => #<Person id: 1, name: "Donald E. Knuth">
-  #
-  #   <%= link_to(@person.name, person_path) %>
-  #   # => <a href="/person/1-donald-e-knuth">Donald E. Knuth</a>
-  def parameterize(sep = '-')
-    MotionSupport::Inflector.parameterize(self, sep)
-  end
-
   # Creates the name of a table like Rails does for models to table names. This method
   # uses the +pluralize+ method on the last word in the string.
   #

data/motion/descendants_tracker.rb

@@ -0,0 +1,50 @@
+module MotionSupport
+  # This module provides an internal implementation to track descendants
+  # which is faster than iterating through ObjectSpace.
+  module DescendantsTracker
+    @@direct_descendants = {}
+
+    class << self
+      def direct_descendants(klass)
+        @@direct_descendants[klass] || []
+      end
+
+      def descendants(klass)
+        arr = []
+        accumulate_descendants(klass, arr)
+        arr
+      end
+
+      def clear
+        @@direct_descendants.clear
+      end
+
+      # This is the only method that is not thread safe, but is only ever called
+      # during the eager loading phase.
+      def store_inherited(klass, descendant)
+        (@@direct_descendants[klass] ||= []) << descendant
+      end
+
+      private
+      def accumulate_descendants(klass, acc)
+        if direct_descendants = @@direct_descendants[klass]
+          acc.concat(direct_descendants)
+          direct_descendants.each { |direct_descendant| accumulate_descendants(direct_descendant, acc) }
+        end
+      end
+    end
+
+    def inherited(base)
+      DescendantsTracker.store_inherited(self, base)
+      super
+    end
+
+    def direct_descendants
+      DescendantsTracker.direct_descendants(self)
+    end
+
+    def descendants
+      DescendantsTracker.descendants(self)
+    end
+  end
+end

data/motion/version.rb

@@ -1,3 +1,3 @@
 module MotionSupport
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/motion-support/_helpers/inflector_test_cases.rb

@@ -162,49 +162,6 @@ module InflectorTestCases
     "NodeChild"        => "node_children"
   }
 
-  StringToParameterized = {
-    "Donald E. Knuth"                     => "donald-e-knuth",
-    "Random text with *(bad)* characters" => "random-text-with-bad-characters",
-    "Allow_Under_Scores"                  => "allow_under_scores",
-    "Trailing bad characters!@#"          => "trailing-bad-characters",
-    "!@#Leading bad characters"           => "leading-bad-characters",
-    "Squeeze   separators"                => "squeeze-separators",
-    "Test with + sign"                    => "test-with-sign",
-    "Test with malformed utf8 \251"       => "test-with-malformed-utf8"
-  }
-
-  StringToParameterizeWithNoSeparator = {
-    "Donald E. Knuth"                     => "donaldeknuth",
-    "With-some-dashes"                    => "with-some-dashes",
-    "Random text with *(bad)* characters" => "randomtextwithbadcharacters",
-    "Trailing bad characters!@#"          => "trailingbadcharacters",
-    "!@#Leading bad characters"           => "leadingbadcharacters",
-    "Squeeze   separators"                => "squeezeseparators",
-    "Test with + sign"                    => "testwithsign",
-    "Test with malformed utf8 \251"       => "testwithmalformedutf8"
-  }
-
-  StringToParameterizeWithUnderscore = {
-    "Donald E. Knuth"                     => "donald_e_knuth",
-    "Random text with *(bad)* characters" => "random_text_with_bad_characters",
-    "With-some-dashes"                    => "with-some-dashes",
-    "Retain_underscore"                   => "retain_underscore",
-    "Trailing bad characters!@#"          => "trailing_bad_characters",
-    "!@#Leading bad characters"           => "leading_bad_characters",
-    "Squeeze   separators"                => "squeeze_separators",
-    "Test with + sign"                    => "test_with_sign",
-    "Test with malformed utf8 \251"       => "test_with_malformed_utf8"
-  }
-
-  StringToParameterizedAndNormalized = {
-    "Malmö"                               => "malmo",
-    "Garçons"                             => "garcons",
-    "Ops\331"                             => "opsu",
-    "Ærøskøbing"                          => "aeroskobing",
-    "Aßlar"                               => "asslar",
-    "Japanese: 日本語"                    => "japanese"
-  }
-
   UnderscoreToHuman = {
     "employee_salary" => "Employee salary",
     "employee_id"     => "Employee",

data/spec/motion-support/descendants_tracker_spec.rb

@@ -0,0 +1,58 @@
+module DescendantsTrackerSpec
+  class Parent
+    extend MotionSupport::DescendantsTracker
+  end
+
+  class Child1 < Parent
+  end
+
+  class Child2 < Parent
+  end
+
+  class Grandchild1 < Child1
+  end
+
+  class Grandchild2 < Child1
+  end
+
+  ALL = [Parent, Child1, Child2, Grandchild1, Grandchild2]
+end
+
+describe "DescendatsTracker" do
+  describe "descendants" do
+    it "should get all descendants from parent class" do
+      [DescendantsTrackerSpec::Child1, DescendantsTrackerSpec::Child2, DescendantsTrackerSpec::Grandchild1, DescendantsTrackerSpec::Grandchild2].should == DescendantsTrackerSpec::Parent.descendants
+    end
+    
+    it "should get descendants from subclass" do
+      [DescendantsTrackerSpec::Grandchild1, DescendantsTrackerSpec::Grandchild2].should == DescendantsTrackerSpec::Child1.descendants
+    end
+    
+    it "should return empty array for leaf class" do
+      [].should == DescendantsTrackerSpec::Child2.descendants
+    end
+  end
+
+  describe "direct_descendants" do
+    it "should get direct descendants from parent class" do
+      [DescendantsTrackerSpec::Child1, DescendantsTrackerSpec::Child2].should == DescendantsTrackerSpec::Parent.direct_descendants
+    end
+    
+    it "should get direct descendants from subclass" do
+      [DescendantsTrackerSpec::Grandchild1, DescendantsTrackerSpec::Grandchild2].should == DescendantsTrackerSpec::Child1.direct_descendants
+    end
+    
+    it "should return empty array for leaf class" do
+      [].should == DescendantsTrackerSpec::Child2.direct_descendants
+    end
+  end
+
+  describe "clear" do
+    it "should remove all tracked descendants" do
+      MotionSupport::DescendantsTracker.clear
+      DescendantsTrackerSpec::ALL.each do |k|
+        MotionSupport::DescendantsTracker.descendants(k).should.be.empty
+      end
+    end
+  end
+end

metadata

@@ -1,49 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: motion-support
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.3
   prerelease: 
-  version: 0.2.2
 platform: ruby
-authors: 
+authors:
 - Thomas Kadauke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: motion-require
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-description: Commonly useful extensions to the standard library for RubyMotion. Ported from ActiveSupport.
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Commonly useful extensions to the standard library for RubyMotion. Ported
+  from ActiveSupport.
+email:
 - thomas.kadauke@googlemail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .yardopts
 - Gemfile
@@ -138,6 +145,7 @@ files:
 - motion/core_ext/time/acts_like.rb
 - motion/core_ext/time/calculations.rb
 - motion/core_ext/time/conversions.rb
+- motion/descendants_tracker.rb
 - motion/duration.rb
 - motion/hash_with_indifferent_access.rb
 - motion/inflections.rb
@@ -202,6 +210,7 @@ files:
 - spec/motion-support/core_ext/time/acts_like_spec.rb
 - spec/motion-support/core_ext/time/calculation_spec.rb
 - spec/motion-support/core_ext/time/conversion_spec.rb
+- spec/motion-support/descendants_tracker_spec.rb
 - spec/motion-support/duration_spec.rb
 - spec/motion-support/hash_with_indifferent_access_spec.rb
 - spec/motion-support/inflector_spec.rb
@@ -209,38 +218,35 @@ files:
 - spec/motion-support/ns_string_spec.rb
 homepage: https://github.com/tkadauke/motion-support
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1040678399660585820
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3381102909433523794
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1040678399660585820
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3381102909433523794
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Commonly useful extensions to the standard library for RubyMotion
-test_files: 
+test_files:
 - spec/motion-support/_helpers/constantize_test_cases.rb
 - spec/motion-support/_helpers/inflector_test_cases.rb
 - spec/motion-support/core_ext/array/access_spec.rb
@@ -298,6 +304,7 @@ test_files:
 - spec/motion-support/core_ext/time/acts_like_spec.rb
 - spec/motion-support/core_ext/time/calculation_spec.rb
 - spec/motion-support/core_ext/time/conversion_spec.rb
+- spec/motion-support/descendants_tracker_spec.rb
 - spec/motion-support/duration_spec.rb
 - spec/motion-support/hash_with_indifferent_access_spec.rb
 - spec/motion-support/inflector_spec.rb