gather 0.0.4 → 0.0.6

data/lib/gather.rb

@@ -1,8 +1,42 @@
-require 'set'
-
 # Provides instance method gather and class method property
 # Allows properties to be Enumerable.
 module Gather
+  # copied from StackOverflow
+  class UniqueArray < Array
+    def initialize(*args)
+      if args.size == 1 and args[0].is_a? Array then
+        super(args[0].uniq)
+      else
+        super(*args)
+      end
+    end
+
+    def insert(i, v)
+      super(i, v) unless include?(v)
+    end
+
+    def <<(v)
+      super(v) unless include?(v)
+    end
+
+    def []=(*args)
+      # note: could just call super(*args) then uniq!, but this is faster
+
+      # there are three different versions of this call:
+      # 1. start, length, value
+      # 2. index, value
+      # 3. range, value
+      # We just need to get the value
+      v = case args.size
+        when 3 then args[2]
+        when 2 then args[1]
+        else nil
+      end
+
+      super(*args) if v.nil? or not include?(v)
+    end
+  end
+
   # Evaluate the block and gather options from args. Even if it's nil.
   # Return self
   def gather( args = {}, &block )
@@ -21,17 +55,29 @@ module Gather
     end
     self
   end
+  
+  def properties
+    self.class.properties
+  end
 
   # return a hash of the properties
   def to_hash( properties = self.class.properties )
     properties.inject({}) {|s,x| s[x] = send(x); s}
   end
   
+  def to_a( properties = self.class.properties )
+    properties.inject([]) {|s,x| s << send(x) }
+  end
+  alias_method :values, :to_a
+  
   # set all values specified in the hash
   def merge!( hash )
     hash.each {|k,v| send( k, v ) }
   end
-  
+    def start=( value )
+    Time.new( value.to_n * 60 * 60 )
+  end
+
   # return a new hash merged with the argument
   def merge( hash )
     to_hash.merge( hash )
@@ -57,7 +103,7 @@ module Gather
   module ClassMethods
     # return properties for only this class
     def own_properties
-      @properties ||= Set.new
+      @properties ||= UniqueArray.new
     end
     
     # return properties for this class and ancestors
@@ -81,15 +127,16 @@ module Gather
               if val.empty?
                 @#{stripped}
               else
-                @#{stripped} = val.size == 1 ? val[0] : val
+                # use the assignment, so only it has to be overloaded
+                self.#{stripped} = val.size == 1 ? val[0] : val
               end
             else
               @#{stripped} = block
             end
           end
           
-          def #{stripped}=(*val)
-            @#{stripped} = val.size == 1 ? val[0] : val
+          def #{stripped}=( value )
+            @#{stripped} = value
           end
         EOF
         class_eval st, __FILE__, line + 1

data/test/test_gather.rb

@@ -9,6 +9,16 @@ class SumDumClass
   property :civ
 end
 
+class NoDuplicateProperties
+  include Gather
+  
+  property :aac
+  property :ben
+  property :civ
+
+  property :aac
+end
+
 class Child < SumDumClass
   property :epi
 end
@@ -30,6 +40,10 @@ class TestGather < Test::Unit::TestCase
     assert_equal @properties, SumDumClass.properties.to_a
   end
   
+  should "not have duplicate properties" do
+    assert_equal @properties, NoDuplicateProperties.properties.to_a
+  end
+
   should "have methods" do
     @properties.each do |prop|
       assert @instance.respond_to?( prop )
@@ -72,13 +86,23 @@ class TestGather < Test::Unit::TestCase
     assert_equal "This is another block", @instance.aac.call(1,2,3)
   end
   
-  should "have hash values" do
-    @instance.aac = 'hey'
-    @instance.ben = 'thewre'
-    @instance.civ = 'dude'
+  context "values" do
+    setup do
+      @instance.aac = 'hey'
+      @instance.ben = 'thewre'
+      @instance.civ = 'dude'
+    end
     
-    hash = {:aac => 'hey', :ben => 'thewre', :civ => 'dude'}
-    assert_equal hash, @instance.to_hash
+    should "hash" do
+      hash = {:aac => 'hey', :civ => 'dude', :ben => 'thewre'}
+      assert_equal hash, @instance.to_hash
+    end
+    
+    should "array" do
+      arr = %w{hey thewre dude}
+      assert_equal arr, @instance.to_a
+      assert_equal arr, @instance.values
+    end
   end
   
   should_eventually "test merge with a hash"
@@ -86,4 +110,6 @@ class TestGather < Test::Unit::TestCase
   should_eventually "test gather with a self-block"
   should_eventually "test gather with a hash"
   should_eventually "test gather with everything"
+  should_eventually "no have duplicate properties, even for subclasses"
+  should_eventually "test that the assignment accessor is canonical"
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gather
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - John Anderson
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 +02:00
+date: 2011-01-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 1
+        - 8
+        - 0
         version: 1.8.0
-    version: 
+  type: :development
+  version_requirements: *id002
 description: |-
   A gem that provides modules to make working with properties a bit easier.
   
@@ -71,6 +89,9 @@ files:
 - lib/changes.rb
 - script/destroy
 - script/generate
+- test/test_helper.rb
+- test/test_changes.rb
+- test/test_gather.rb
 has_rdoc: true
 homepage: http://gather.rubyforge.org
 licenses: []
@@ -82,21 +103,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: clevic
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A gem that provides modules to make working with properties a bit easier