maiha-dm-ys 0.3.1 → 0.4

data/README

@@ -7,7 +7,7 @@ Example
 =======
 
   class Maintainer
-    include DataMapper::YunkerStar
+    include DataMapper::YS
     uri "http://datamapper.org/doku.php?id=gem_maintainers"
   end
 
@@ -24,13 +24,28 @@ Example
   => ["Gem", "Maintainer", "Name"]
 
 
+Anonymous class
+===============
+
+[] is a syntax sugar for generating anonymous class
+
+  Wota = DataMapper::YS["http://wota.jp"]
+
+is equivalent to
+
+  class Wota
+    include DataMapper::YS
+    uri "http://wota.jp"
+  end
+
+
 Pagination
 ==========
 
-Special syntax "uri*" means pagination mode that enables recursive retrieving.
+Special syntax "URI*" means pagination mode that enables recursive retrieving.
 
   class Plugin
-    include DataMapper::YunkerStar
+    include DataMapper::YS
     uri "http://merbi.st/plugins/index?page=1"
   end
 
@@ -41,7 +56,7 @@ This parses only specified uri.
 Append "*" to uri if you want pagination mode.
   
   class Plugin
-    include DataMapper::YunkerStar
+    include DataMapper::YS
     uri "http://merbi.st/plugins/index?page=1*"
   end
 
@@ -49,4 +64,8 @@ Append "*" to uri if you want pagination mode.
   => 36
 
 
+TODO
+====
+* store link information for each columns
+
 Copyright (c) 2008 maiha@wota.jp, released under the MIT license

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.3.1"
+GEM_VERSION = "0.4"
 
 spec = Gem::Specification.new do |s|
 #  s.rubyforge_project = 'merb'

data/lib/dm-ys.rb

@@ -10,4 +10,5 @@ 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/element_property'
 require __DIR__ + '/dm-ys/scraper'

data/lib/dm-ys/base.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module YunkerStar
+  module YS
     # @api public
     def self.append_inclusions(*inclusions)
       extra_inclusions.concat inclusions
@@ -12,10 +12,11 @@ module DataMapper
 
     # @api private
     def self.included(model)
-      name = 'YunkelStar'
+      name = 'YS'
       model.send :include, DataMapper::Resource
       model.send :include, Proxy
       model.send :include, IndexedProperty
+      model.send :include, ElementProperty
       # model.send :include, MemoryRepository
       model.const_set(name, self) unless model.const_defined?(name)
       extra_inclusions.each { |inclusion| model.send(:include, inclusion) }
@@ -29,10 +30,11 @@ module DataMapper
 
     # @api public
     def self.[](uri)
-      klass = Class.new do
-        include DataMapper::YunkerStar
+      klass = Class.new
+      klass.class_eval do
+        include DataMapper::YS
+        self.uri uri
       end
-      klass.uri uri
       return klass
     end
   end

data/lib/dm-ys/cached_accessor.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module YunkerStar
+  module YS
     ######################################################################
     ### CachedAccessor
 

data/lib/dm-ys/config.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module YunkerStar
+  module YS
     class Config
       def self.default
         {:max_pages=>100, :uniq=>true}

data/lib/dm-ys/indexed_property.rb

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

data/lib/dm-ys/memory_repository.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module YunkerStar
+  module YS
     ######################################################################
     ### MemoryRepository
 

data/lib/dm-ys/proxy.rb

@@ -1,10 +1,10 @@
 module DataMapper
-  module YunkerStar
+  module YS
 
     # ==== Example
     #
     #   Class Foo
-    #     include DataMapper::YunkerStar
+    #     include DataMapper::YS
     #
     #     uri   "http://ds.gkwiki2.com/47.html"
     #     thead "table.style_table thead tr"
@@ -18,7 +18,7 @@ module DataMapper
           dsl_accessor :table
           dsl_accessor :tbody
           dsl_accessor :thead
-          dsl_accessor :ys, :default=>proc{|*a| DataMapper::YunkerStar::Config.new}
+          dsl_accessor :ys, :default=>proc{|*a| DataMapper::YS::Config.new}
           property :id, DataMapper::Types::Serial
         end
       end
@@ -38,20 +38,16 @@ module DataMapper
           proxy.labels
         end
 
-        def entries
-          proxy.entries
+        def records
+          @records ||= (proxy.records.each_with_index{|r,i| r.id = i+1}; proxy.records)
         end
 
         def count
-          entries.size
+          records.size
         end
 
         def all
-          count = 0
-          @all ||= entries.map{|array|
-            count += 1
-            new(Hash[*names.zip(array).flatten].merge(:id=>count))
-          }
+          records
         end
 
         def first

data/lib/dm-ys/scraper.rb

@@ -1,5 +1,5 @@
 module DataMapper
-  module YunkerStar
+  module YS
 
     ######################################################################
     ### Scrape html
@@ -56,12 +56,12 @@ module DataMapper
           raise ArgumentError, "missing uri"   unless model.uri
           @model = model
         end
-        [:names, :labels, :entries].each do |method|
+        [:names, :labels, :records].each do |method|
           define_method(method) {raise NotImplementedError, method.to_s}
         end
 
         def count
-          entries.size
+          records.size
         end
 
         def uri
@@ -104,24 +104,31 @@ module DataMapper
           attrs = [
             [ :html,      "#{html.size}bytes" ],
             [ :names,     names ],
-            [ :entries,   count ],
+            [ :records,   count ],
           ]
           "#<#{self.class.name} #{attrs.map { |(k,v)| "@#{k}=#{v.inspect}" } * ' '}>"
         end
 
         def page_hash
-          body = entries.flatten.join("\t")
-          Digest::SHA1.hexdigest(body)
+          Digest::SHA1.hexdigest(tbody.inspect)
         end
 
         cached_accessor do
-          doc     {Hpricot(@html)}
-          table   {specified(:table) or guess_table}
-          thead   {specified(:thead) or table.search("> thead").first or table}
-          tbody   {specified(:tbody) or table.search("> tbody").first or table}
-          names   {labels.map{|i| label2name(i)}}
-          labels  {thead.search("> tr").first.search("> td|th").map{|i|strip_tags(i.inner_html)}}
-          entries {tbody.search("> tr").map{|tr| tr.search("> td").map{|i|strip_tags(i.inner_html)}}.delete_if{|i|i.blank?}}
+          doc      {Hpricot(@html)}
+          table    {specified(:table) or guess_table}
+          thead    {specified(:thead) or table.search("> thead").first or table}
+          tbody    {specified(:tbody) or table.search("> tbody").first or table}
+          names    {labels.map{|i| label2name(i)}}
+          labels   {thead.search("> tr").first.search("> td|th").map{|i|strip_tags(i.inner_html)}}
+          records  {
+            tbody.search("> tr").map do |tr|
+              elems  = tr.search("> td")
+              values = elems.map{|i|strip_tags(i.inner_html)}
+              record = @model.new(Hash[*names.zip(values).flatten])
+              record.elements = Hash[*names.zip(elems).flatten]
+              record
+            end
+          }
         end
 
         private
@@ -195,13 +202,13 @@ module DataMapper
           pages.first.labels
         end
 
-        def entries
+        def records
           records = []
           digests = Set.new
           pages.each do |page|
-            page.entries.each do |entry|
+            page.records.each do |entry|
               if config.uniq_entry?
-                sha1 = Digest::SHA1.hexdigest(entry.join("\t"))
+                sha1 = entry.attributes.merge(:id=>nil).inspect
                 next if digests.include?(sha1)
                 digests << sha1
               end

data/spec/anonymous_spec.rb

@@ -1,22 +1,32 @@
 require File.join( File.dirname(__FILE__), "spec_helper" )
 
-describe DataMapper::YunkerStar do
+describe DataMapper::YS do
   it "should provide []" do
-    DataMapper::YunkerStar.should respond_to(:[])
+    DataMapper::YS.should respond_to(:[])
   end
 
   describe "[]" do
     before(:each) do
       @uri = "http://merbi.st/plugins/index?page=1"
-      @ys  = DataMapper::YunkerStar[@uri]
+      @ys  = DataMapper::YS[@uri]
     end
 
     it "should return a new class" do
       @ys.should be_kind_of(Class)
     end
 
-    it "should include DataMapper::YunkerStar" do
-      @ys.ancestors.should be_include(DataMapper::YunkerStar)
+    it "should include DataMapper::YS" do
+      @ys.ancestors.should be_include(DataMapper::YS)
+    end
+
+    it "should have ys option" do
+      @ys.should respond_to(:ys)
+    end
+
+    describe ".ys" do
+      it "should return a kind of Config" do
+        @ys.ys.should be_kind_of(DataMapper::YS::Config)
+      end
     end
 
     it "should set uri" do

data/spec/composite_scraper_spec.rb

@@ -1,8 +1,12 @@
 require File.join( File.dirname(__FILE__), "spec_helper" )
 
-describe DataMapper::YunkerStar::Scraper::Composite do
+describe DataMapper::YS::Scraper::Composite do
   before(:each) do
-    @scraper = DataMapper::YunkerStar::Scraper::Composite.new(Plugin)
+    @scraper = DataMapper::YS::Scraper::Composite.new(Plugin)
+  end
+
+  def strip_id(records)
+    records.map{|r| r = r.dup; r.attributes[:id] = nil; r}
   end
 
   it "should provide #uri" do
@@ -43,7 +47,7 @@ describe DataMapper::YunkerStar::Scraper::Composite do
 
   describe "#names" do
     it "should return same value as Plugin" do
-      @scraper.names.should == DataMapper::YunkerStar::Scraper::Page.new(Plugin1).names
+      @scraper.names.should == DataMapper::YS::Scraper::Page.new(Plugin1).names
     end
   end
 
@@ -53,17 +57,18 @@ describe DataMapper::YunkerStar::Scraper::Composite do
 
   describe "#labels" do
     it "should return same value as Plugin" do
-      @scraper.labels.should == DataMapper::YunkerStar::Scraper::Page.new(Plugin1).labels
+      @scraper.labels.should == DataMapper::YS::Scraper::Page.new(Plugin1).labels
     end
   end
 
-  it "should provide #entries" do
-    @scraper.should respond_to(:entries)
+  it "should provide #records" do
+    @scraper.should respond_to(:records)
   end
 
-  describe "#entries" do
+  describe "#records" do
     it "should return same value as Plugin" do
-      @scraper.entries.should == (Plugin1.entries + Plugin2.entries)
+      @scraper.records.map(&:Name).should ==
+        Plugin1.records.map(&:Name) + Plugin2.records.map(&:Name)
     end
   end
 
@@ -72,14 +77,15 @@ describe DataMapper::YunkerStar::Scraper::Composite do
       SortedPlugin.proxy.pages.size.should == 6
     end
 
-    describe "#entries" do
-      it "should return duplicate entries" do
-        SortedPlugin.entries.sort.should == ((SortedPlugin1.entries + SortedPlugin2.entries)*3).sort
+    describe "#records" do
+      it "should return duplicate records" do
+        total = SortedPlugin1.records.map{|i|i[1]} + SortedPlugin2.records.map{|i|i[1]}
+        SortedPlugin.records.map{|i|i[1]}.sort.should == (total*3).sort
       end
     end
 
     describe "#count" do
-      it "should return duplicate entries" do
+      it "should return duplicate records" do
         SortedPlugin.count.should == (SortedPlugin1.count + SortedPlugin2.count)*3
       end
     end
@@ -90,9 +96,10 @@ describe DataMapper::YunkerStar::Scraper::Composite do
       SortedPluginWithUniqPage.proxy.pages.size.should == 2
     end
 
-    describe "#entries" do
+    describe "#records" do
       it "should return same value as Plugin" do
-        SortedPluginWithUniqPage.entries.should == (SortedPlugin1.entries + SortedPlugin2.entries)
+        SortedPluginWithUniqPage.records.map{|i|i[1]}.sort.should ==
+          (SortedPlugin1.records.map{|i|i[1]} + SortedPlugin2.records.map{|i|i[1]}).sort
       end
     end
 
@@ -102,20 +109,4 @@ describe DataMapper::YunkerStar::Scraper::Composite do
       end
     end
   end
-
-  describe "UniqPlugin" do
-    it "should return 2 pages" do
-      UniqPlugin.proxy.pages.size.should == 2
-    end
-
-    describe "#count" do
-      it "should return same value as Plugin" do
-        UniqPlugin1.count.should == 20
-        UniqPlugin2.count.should == 4
-        UniqPlugin .count.should == 22
-      end
-    end
-  end
-
-
 end

data/spec/config_spec.rb

@@ -1,8 +1,8 @@
 require File.join( File.dirname(__FILE__), "spec_helper" )
 
-describe DataMapper::YunkerStar::Config do
+describe DataMapper::YS::Config do
   before(:each) do
-    @config = DataMapper::YunkerStar::Config.new
+    @config = DataMapper::YS::Config.new
   end
 
   it "should provide []" do
@@ -25,17 +25,17 @@ describe DataMapper::YunkerStar::Config do
     end
 
     it "should return true when :uniq is set to :page" do
-      config = DataMapper::YunkerStar::Config.new(:uniq=>:page)
+      config = DataMapper::YS::Config.new(:uniq=>:page)
       config.uniq_page?.should == true
     end
 
     it "should return true when :uniq is set to :entry" do
-      config = DataMapper::YunkerStar::Config.new(:uniq=>:entry)
+      config = DataMapper::YS::Config.new(:uniq=>:entry)
       config.uniq_page?.should == true
     end
 
     it "should return false when :uniq is set to false" do
-      config = DataMapper::YunkerStar::Config.new(:uniq=>false)
+      config = DataMapper::YS::Config.new(:uniq=>false)
       config.uniq_page?.should == false
     end
   end
@@ -50,17 +50,17 @@ describe DataMapper::YunkerStar::Config do
     end
 
     it "should return false when :uniq is set to :page" do
-      config = DataMapper::YunkerStar::Config.new(:uniq=>:page)
+      config = DataMapper::YS::Config.new(:uniq=>:page)
       config.uniq_entry?.should == false
     end
 
     it "should return true when :uniq is set to :entry" do
-      config = DataMapper::YunkerStar::Config.new(:uniq=>:entry)
+      config = DataMapper::YS::Config.new(:uniq=>:entry)
       config.uniq_entry?.should == true
     end
 
     it "should return false when :uniq is set to :page" do
-      config = DataMapper::YunkerStar::Config.new(:uniq=>false)
+      config = DataMapper::YS::Config.new(:uniq=>false)
       config.uniq_entry?.should == false
     end
 

data/spec/data/sorted1.html

@@ -75,144 +75,6 @@
       <td>
       </td>
     </tr>
-    <tr class="">
-      <td><a href="/plugins/33">merb-slices-search-path-fix-0.0.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A merb plugin that fixes </td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/32">rubyforge-1.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A script which automates a limited set of rubyforge operations.
-</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/31">ruby-git</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Ruby/Git is a Ruby library that can be used to create, read and manipulate Git repositories by wrapping system calls to the git binary.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/30">fastthread-1.0.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>fastthread that is compatible to ruby191</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/29">mime-types-1.15.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>This library allows for the identification of a file’s likely MIME content type.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/28">memcached-0.14</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A Ruby interface to the libmemcached C client</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/27">gem_plugin-0.2.3</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Gem Based Plugin System</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/26">cgi_multipart_eof_fix-2.5.0</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>cgi_multipart_eof_fix on github</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/25">mongrel-1.1.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Mongrel</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/24">hpricot-0.6.207</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A swift, liberal HTML parser with a fantastic library</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/23">methopara-0.3.0</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Method#parameters for ruby-1.9.1</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/22">irb_rocket-0.1.3</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>irb plugin that makes irb #=&gt; rocket</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/21">ruby-terminfo-0.1.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>ruby-terminfo is a terminfo binding for Ruby</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/20">extlib-present-0.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A plugin that provides Object#present?</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/19">merb_render_filter-0.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A plugin that provides {before|after}_render filters for Controller.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/18">bcrypt-ruby-2.0.3</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>bcrypt-ruby is a Ruby binding for the OpenBSD bcrypt() password hashing algorithm, allowing you to easily store a secure hash of your users' passwords.
-</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/17">json-1.1.4.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>This library can parse JSON texts and generate them from ruby data structures. Install the extension variant (in C) with &quot;gem install json&quot; or install the pure Ruby variant with &quot;gem install json_pure&quot;.</td>
-      <td>
-      </td>
-    </tr>
   </tbody>
 </table>
 

data/spec/data/sorted2.html

@@ -75,110 +75,6 @@
       <td>
       </td>
     </tr>
-    <tr class="">
-      <td><a href="/plugins/13">merb_full_url-0.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A plugin for merb framework that provides full_url/full_resource method.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/12">merb_timezone_select-0.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A plugin for the Merb framework that provides timezone selector</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/11">merb_slice-gen-0.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>generator for slices</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/10">merb_recognize_path-0.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A merb plugin for the Merb framework that provides recognize_path method. </td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/9">merb_component-0.2.3</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Merb plugin that provides composition of controllers.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/8">dm-pagination-0.1.2.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A pagination plugin for DataMapper.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/7">pagination_scope-0.0.8</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>This is a rails plugin module for mixing in pagination function.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/6">rttool-1.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Simple table generator</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/5">dm-has-versions-0.1.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A plugin that adds version control to DataMapper models.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/4">merb_babel-0.1.2.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Merb用I18n/L10nライブラリ</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/3">dm-is-paginated</a></td>
-      <td></td>
-      <td><a href="/users/1">genki</a></td>
-      <td>dm-is-paginated is a simple pagination plugin for DataMapper.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/2">merb-pagination</a></td>
-      <td></td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A pagination helper for merb. Useful with dm-is-paginated or with Sequel’s built in pagination.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/1">merb-auth-slice-activation</a></td>
-      <td></td>
-      <td><a href="/users/1">genki</a></td>
-      <td>This slice provides a check to make sure that a user is active on login. It also provides activation on the “user” object via an activation action (slice_url :activate).</td>
-      <td>
-      </td>
-    </tr>
   </tbody>
 </table>
 

data/spec/data/uniq1.html

@@ -51,7 +51,7 @@
       <td><a href="/plugins/36">eventmachine-0.12.5</a></td>
       <td>&dagger;</td>
       <td><a href="/users/1">genki</a></td>
-      <td>EventMachine: fast, simple event-processing library for Ruby programs</td>
+      <td>EventMachine</td>
       <td>
       </td>
     </tr>
@@ -59,153 +59,7 @@
       <td><a href="/plugins/35">dm-last-0.0.1</a></td>
       <td>&dagger;</td>
       <td><a href="/users/1">genki</a></td>
-      <td>A DataMapper plugin that offers a short-hand for Model.all.last as Model.last</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/34">sweet_merb_fixtures-0.0.4</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>The way to store records from YAML file.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/33">merb-slices-search-path-fix-0.0.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A merb plugin that fixes </td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/32">rubyforge-1.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A script which automates a limited set of rubyforge operations.
-</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/31">ruby-git</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Ruby/Git is a Ruby library that can be used to create, read and manipulate Git repositories by wrapping system calls to the git binary.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/30">fastthread-1.0.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>fastthread that is compatible to ruby191</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/29">mime-types-1.15.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>This library allows for the identification of a file’s likely MIME content type.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/28">memcached-0.14</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A Ruby interface to the libmemcached C client</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/27">gem_plugin-0.2.3</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Gem Based Plugin System</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/26">cgi_multipart_eof_fix-2.5.0</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>cgi_multipart_eof_fix on github</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/25">mongrel-1.1.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Mongrel</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/24">hpricot-0.6.207</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A swift, liberal HTML parser with a fantastic library</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/23">methopara-0.3.0</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>Method#parameters for ruby-1.9.1</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/22">irb_rocket-0.1.3</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>irb plugin that makes irb #=&gt; rocket</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/21">ruby-terminfo-0.1.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>ruby-terminfo is a terminfo binding for Ruby</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/20">extlib-present-0.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A plugin that provides Object#present?</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/19">merb_render_filter-0.0.2</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>A plugin that provides {before|after}_render filters for Controller.</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/18">bcrypt-ruby-2.0.3</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>bcrypt-ruby is a Ruby binding for the OpenBSD bcrypt() password hashing algorithm, allowing you to easily store a secure hash of your users' passwords.
-</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="">
-      <td><a href="/plugins/17">json-1.1.4.1</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>This library can parse JSON texts and generate them from ruby data structures. Install the extension variant (in C) with &quot;gem install json&quot; or install the pure Ruby variant with &quot;gem install json_pure&quot;.</td>
+      <td>Model.last</td>
       <td>
       </td>
     </tr>

data/spec/data/uniq2.html

@@ -47,27 +47,11 @@
     </tr>
   </thead>
   <tbody>
-    <tr class="even">
-      <td><a href="/plugins/16">templater-0.5.0</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>RubiGen alternative Generator thingy</td>
-      <td>
-      </td>
-    </tr>
     <tr class="">
       <td><a href="/plugins/15">hosts_access-0.3</a></td>
       <td>&dagger;</td>
       <td><a href="/users/1">genki</a></td>
-      <td>Rails/Merb plugin that controls host access like hosts.allow</td>
-      <td>
-      </td>
-    </tr>
-    <tr class="even">
-      <td><a href="/plugins/36">eventmachine-0.12.5</a></td>
-      <td>&dagger;</td>
-      <td><a href="/users/1">genki</a></td>
-      <td>EventMachine: fast, simple event-processing library for Ruby programs</td>
+      <td>hosts.allow</td>
       <td>
       </td>
     </tr>
@@ -75,7 +59,7 @@
       <td><a href="/plugins/35">dm-last-0.0.1</a></td>
       <td>&dagger;</td>
       <td><a href="/users/1">genki</a></td>
-      <td>A DataMapper plugin that offers a short-hand for Model.all.last as Model.last</td>
+      <td>Model.last</td>
       <td>
       </td>
     </tr>

data/spec/indexed_property_spec.rb

@@ -1,6 +1,6 @@
 require File.join( File.dirname(__FILE__), "spec_helper" )
 
-describe DataMapper::YunkerStar do
+describe DataMapper::YS do
   before(:each) do
     @plugin = Plugin1.first
   end
@@ -25,7 +25,7 @@ describe DataMapper::YunkerStar do
     it "should raise InvalidIndex for unknown key" do
       lambda {
         @plugin[Object]
-      }.should raise_error(DataMapper::YunkerStar::InvalidIndex)
+      }.should raise_error(DataMapper::YS::InvalidIndex)
     end
   end
 

data/spec/models/gem_maintainer.rb

@@ -1,4 +1,4 @@
 class ::GemMaintainer
-  include DataMapper::YunkerStar
+  include DataMapper::YS
   uri spec_data_path("gem_maintainers.html")
 end

data/spec/models/plugin.rb

@@ -1,53 +1,49 @@
 class Plugin
-  include DataMapper::YunkerStar
+  include DataMapper::YS
   uri "http://merbi.st/plugins/index?page=1*"
 end
 
 class Plugin1
-  include DataMapper::YunkerStar
+  include DataMapper::YS
   uri "http://merbi.st/plugins/index?page=1"
 end
 
 class Plugin2
-  include DataMapper::YunkerStar
+  include DataMapper::YS
   uri "http://merbi.st/plugins/index?page=2"
 end
 
 class SortedPlugin
-  include DataMapper::YunkerStar
+  include DataMapper::YS
   uri "http://merbi.st/plugins/sorted?page=1*"
   ys[:uniq] = false
 end
 
-class SortedPlugin1
-  include DataMapper::YunkerStar
+class SortedPlugin1 < SortedPlugin
   uri "http://merbi.st/plugins/sorted?page=1"
-  ys[:uniq] = false
 end
 
-class SortedPlugin2
-  include DataMapper::YunkerStar
+class SortedPlugin2 < SortedPlugin
   uri "http://merbi.st/plugins/sorted?page=2"
-  ys[:uniq] = false
 end
 
 class SortedPluginWithUniqPage
-  include DataMapper::YunkerStar
+  include DataMapper::YS
   uri "http://merbi.st/plugins/sorted?page=1*"
   ys[:uniq] = :page
 end
 
 class UniqPlugin
-  include DataMapper::YunkerStar
+  include DataMapper::YS
   uri "http://merbi.st/plugins/uniq?page=1*"
 end
 
 class UniqPlugin1
-  include DataMapper::YunkerStar
+  include DataMapper::YS
   uri "http://merbi.st/plugins/uniq?page=1"
 end
 
 class UniqPlugin2
-  include DataMapper::YunkerStar
+  include DataMapper::YS
   uri "http://merbi.st/plugins/uniq?page=2"
 end

data/spec/pagination_spec.rb

@@ -1,6 +1,6 @@
 require File.join( File.dirname(__FILE__), "spec_helper" )
 
-describe DataMapper::YunkerStar do
+describe DataMapper::YS do
   it "should provide proxy" do
     Plugin1.count.should == 20
   end

data/spec/proxy_spec.rb

@@ -1,13 +1,13 @@
 require File.join( File.dirname(__FILE__), "spec_helper" )
 
-describe DataMapper::YunkerStar do
+describe DataMapper::YS do
   class ::BlankHtml
-    include DataMapper::YunkerStar
+    include DataMapper::YS
     uri spec_data_path("blank.html")
   end
 
   class ::BlankStyle
-    include DataMapper::YunkerStar
+    include DataMapper::YS
     uri spec_data_path("plugins1.html")
   end
 
@@ -30,12 +30,12 @@ describe DataMapper::YunkerStar do
 
   describe ".ys" do
     it "should return a ys config" do
-      Plugin.ys.should be_kind_of(DataMapper::YunkerStar::Config)
+      Plugin.ys.should be_kind_of(DataMapper::YS::Config)
     end
 
     describe "[:max_pages]" do
       class NetworkUnreachable
-        include DataMapper::YunkerStar
+        include DataMapper::YS
         uri "http://merbi.st/plugins/index?page=1*"
         ys[:max_pages] = 0
       end
@@ -47,7 +47,7 @@ describe DataMapper::YunkerStar do
       it "should raise MaxPagesOverflow when count of visited sites exceeds :max_pages value" do
         lambda {
           NetworkUnreachable.count
-        }.should raise_error(DataMapper::YunkerStar::Proxy::MaxPagesOverflow)
+        }.should raise_error(DataMapper::YS::Proxy::MaxPagesOverflow)
       end
     end
   end
@@ -76,7 +76,7 @@ describe DataMapper::YunkerStar do
       it "should raise when the html contains no tables" do
         lambda {
           BlankHtml.proxy.guess_table
-        }.should raise_error(DataMapper::YunkerStar::Scraper::TableNotFound)
+        }.should raise_error(DataMapper::YS::Scraper::TableNotFound)
       end
     end
 
@@ -87,7 +87,7 @@ describe DataMapper::YunkerStar do
         it "should raise when the html contains no tables" do
           lambda {
             BlankHtml.proxy.table
-          }.should raise_error(DataMapper::YunkerStar::Scraper::TableNotFound)
+          }.should raise_error(DataMapper::YS::Scraper::TableNotFound)
         end
 
         it "should return specified table" do
@@ -106,7 +106,7 @@ describe DataMapper::YunkerStar do
       it "should raise when the html contains no tables" do
         lambda {
           BlankHtml.proxy.thead
-        }.should raise_error(DataMapper::YunkerStar::Scraper::TableNotFound)
+        }.should raise_error(DataMapper::YS::Scraper::TableNotFound)
       end
     end
 

data/spec/scraper_spec.rb

@@ -1,8 +1,8 @@
 require File.join( File.dirname(__FILE__), "spec_helper" )
 
-describe DataMapper::YunkerStar::Proxy  do
+describe DataMapper::YS::Proxy  do
   before(:each) do
-    @scraper = DataMapper::YunkerStar::Scraper::Page.new(Plugin1)
+    @scraper = DataMapper::YS::Scraper::Page.new(Plugin1)
   end
 
   it "should provide #uri" do

data/spec/scraper_utils_spec.rb

@@ -1,10 +1,10 @@
 require File.join( File.dirname(__FILE__), "spec_helper" )
 
-describe DataMapper::YunkerStar::Scraper::Utils  do
-  include DataMapper::YunkerStar::Scraper::Utils
+describe DataMapper::YS::Scraper::Utils  do
+  include DataMapper::YS::Scraper::Utils
 
   it "should provide .constantize" do
-    DataMapper::YunkerStar::Scraper::Utils.should respond_to(:constantize)
+    DataMapper::YS::Scraper::Utils.should respond_to(:constantize)
   end
 
   describe ".constantize" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: maiha-dm-ys
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: "0.4"
 platform: ruby
 authors: 
 - maiha