maiha-dm-ys 0.2.1 → 0.2.2

data/Rakefile

@@ -33,7 +33,7 @@ AUTHOR = "maiha"
 EMAIL = "maiha@wota.jp"
 HOMEPAGE = "http://github.com/maiha/dm-ys"
 SUMMARY = "a DataMapper extension that uses html table as its schema and data powerfully like YunkerStar"
-GEM_VERSION = "0.2.1"
+GEM_VERSION = "0.2.2"
 
 spec = Gem::Specification.new do |s|
 #  s.rubyforge_project = 'merb'

data/lib/dm-ys.rb

@@ -8,4 +8,5 @@ require __DIR__ + '/dm-ys/base'
 require __DIR__ + '/dm-ys/cached_accessor'
 require __DIR__ + '/dm-ys/memory_repository'
 require __DIR__ + '/dm-ys/proxy'
+require __DIR__ + '/dm-ys/indexed_property'
 require __DIR__ + '/dm-ys/scraper'

data/lib/dm-ys/base.rb

@@ -15,6 +15,7 @@ module DataMapper
       name = 'YunkelStar'
       model.send :include, DataMapper::Resource
       model.send :include, Proxy
+      model.send :include, IndexedProperty
       # model.send :include, MemoryRepository
       model.const_set(name, self) unless model.const_defined?(name)
       extra_inclusions.each { |inclusion| model.send(:include, inclusion) }

data/lib/dm-ys/indexed_property.rb

@@ -0,0 +1,31 @@
+module DataMapper
+  module YunkerStar
+
+    # ==== Example
+    #
+    #   Class Foo
+    #     include DataMapper::YunkerStar
+    #     property :id, Serial
+    #
+    #   foo = Foo.new
+    #   foo[0] == foo[:id] == foo["id"] == foo.attributes[:id]
+
+    class InvalidIndex < RuntimeError; end
+
+    module IndexedProperty
+      def [](key)
+        case key
+        when Integer
+          self[properties.map(&:name)[key]]
+        when String
+          attributes[key.intern]
+        when Symbol
+          attributes[key]
+        else
+          raise InvalidIndex, "expected Integer/String/Symbol, but got #{key.class}"
+        end
+      end
+    end
+
+  end
+end

data/lib/dm-ys/proxy.rb

@@ -53,8 +53,10 @@ module DataMapper
         end
 
         def all
+          count = 0
           @all ||= proxy.entries.map{|array|
-            new(Hash[*proxy.names.zip(array).flatten])
+            count += 1
+            new(Hash[*proxy.names.zip(array).flatten].merge(:id=>count))
           }
         end
 

data/spec/indexed_property_spec.rb

@@ -0,0 +1,37 @@
+require File.join( File.dirname(__FILE__), "spec_helper" )
+
+describe DataMapper::YunkerStar do
+  class ::Cute1
+    include DataMapper::YunkerStar
+    uri spec_data_path("cute1.html")
+  end
+
+  before(:each) do
+    @cute = Cute1.first
+  end
+
+  it "should provide #[]" do
+    @cute.should respond_to(:[])
+  end
+
+  describe "#[]" do
+    it "should accept symbol as a key" do
+      @cute[:id].should == 1
+    end
+
+    it "should accept string as a key" do
+      @cute["id"].should == 1
+    end
+
+    it "should accept integer as a key" do
+      @cute[0].should == 1
+    end
+
+    it "should raise InvalidIndex for unknown key" do
+      lambda {
+        @cute[Object]
+      }.should raise_error(DataMapper::YunkerStar::InvalidIndex)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maiha-dm-ys
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - maiha
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-01 00:00:00 -08:00
+date: 2009-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - lib/dm-ys.rb
 - lib/dm-ys
 - lib/dm-ys/base.rb
+- lib/dm-ys/indexed_property.rb
 - lib/dm-ys/memory_repository.rb
 - lib/dm-ys/scraper.rb
 - lib/dm-ys/cached_accessor.rb
@@ -67,7 +68,7 @@ files:
 - spec/data/cute1.html
 - spec/data/ki.html
 - spec/data/blank.html
-- spec/attribute_spec.rb
+- spec/indexed_property_spec.rb
 - spec/spec_helper.rb
 - spec/pagination_spec.rb
 has_rdoc: true