hatebu_entry 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc791c59fc9c6d54a195faabf92c4ba1e0e975f
-  data.tar.gz: cefb430f9a0c13c15091c68623a71ec88ad425b2
+  metadata.gz: 9505a7c4b18cdba01d9401597852463ec166f2ba
+  data.tar.gz: 4d3fd62f8a172142049a882da36c39d8cd94ce86
 SHA512:
-  metadata.gz: c5d180e72f0c58a6cc784aace4e863c6b7e987d168e04e5770bc5a40d4ccb2743e54dd6eddaf51dad4fbd34fe3c15f00ebb5e557c56570939496996fa12ebdfd
-  data.tar.gz: 64cdf4b601d521e24a91b74599e91f0abe17d7f1824bc9827d44ccedbd4736f7c3218a9632c7b3ea8837c21657191ee25106ca0d2c03aa6b8dcec81dd7abe2c8
+  metadata.gz: 9233d63e5f903e3b5bddcb8f969c3ecf253eddf93ec60b4b7490fd9a1e6cf599959e7e53a07b53e048f2cb2d7cc9792826f1e1d04ce1682eada4eb5f575d03d4
+  data.tar.gz: 9b04196e3ef35d81f2af16d781c2ccf7077bd973211f9aa1548251a6edf4db4120d0bdc70cd49c78956ed31bc66ba6abb0ad7ec42d613e3c6e4cdd3d58b56010

data/lib/hatebu_entry.rb

@@ -65,7 +65,7 @@ class HatebuEntry
           entries.push a
         end
       end
-      entries + ls_b
+      (entries + ls_b).sort_by { |ent| -ent.count }
     end
   end
 
@@ -127,7 +127,7 @@ class HatebuEntry
   end
 
   def parse_jsonp(jsonp)
-    jsonp.scan(/{.+?}/).map { |data| JSON.parse data }
+    jsonp.scan(/{\s*\".+?\"\s*}/).map { |data| JSON.parse data }
   end
 
   def parse_html(html)

data/lib/hatebu_entry/version.rb

@@ -1,3 +1,3 @@
 class HatebuEntry
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/hatebu_entry_spec.rb

@@ -146,4 +146,26 @@ describe HatebuEntry::Entry do
       end
     end
   end
+
+  describe ".merge" do
+    it "merges same entries" do
+      merged = HatebuEntry::Entry.merge([@ent1], [@ent2]) 
+      expect(merged.size).to eq 1
+    end
+
+    it "don't merge diff entries" do
+      merged = HatebuEntry::Entry.merge([@ent1], [@ent4]) 
+      expect(merged.size).to eq 2
+    end
+
+    it "merge only same entries" do
+      merged = HatebuEntry::Entry.merge([@ent1], [@ent4, @ent2]) 
+      expect(merged.size).to eq 2
+    end
+
+    it "sort merge result in desc count order" do
+      merged = HatebuEntry::Entry.merge([@ent4, @ent2], [@ent1]) 
+      expect(merged.first.count).to eq 30
+    end
+  end
 end

data/spec/support/hatebu_entry.jsonp

@@ -1 +1 @@
-([{"link":"http://melborne.github.com/2012/04/09/to-newbie/","count":"1377","title":"これからRubyを始める人たちへ"},{"link":"http://melborne.github.com/2013/03/04/ruby-trivias-you-should-know-4/","count":"633","title":"知って得する！５５のRubyのトリビアな記法"},{"link":"http://melborne.github.com/2013/02/25/i-wanna-say-something-about-rubys-case/","count":"514","title":"Rubyのcaseを〇〇(言語名)のswitch文だと思っている人たちにぼ..."},{"link":"http://melborne.github.com/2011/06/22/21-Ruby-21-Trivia-Notations-you-should-know-in-Ruby/","count":"442","title":"知って得する21のRubyのトリビアな記法"},{"link":"http://melborne.github.com/2012/09/09/understand-js-oop-with-ruby-brain/","count":"435","title":"Ruby脳が理解するJavaScriptのオブジェクト指向"},{"link":"http://melborne.github.com/2012/12/25/ebooks-for-learning-ruby/","count":"269","title":"今年の冬休みに電子書籍であなたがRubyを習得しなければい..."},{"link":"http://melborne.github.com/2012/07/16/ruby-methods-analysis/","count":"236","title":"Ruby、君のオブジェクトはなんて呼び出せばいいの？"},{"link":"http://melborne.github.com/2013/01/21/why-fp-with-ruby/","count":"187","title":"Rubyを使って「なぜ関数プログラミングは重要か」を読み解..."},{"link":"http://melborne.github.com/2012/09/15/understand-js-oop-with-ruby-brain-2/","count":"178","title":"Ruby脳が理解するJavaScriptのオブジェクト指向（その２）"},{"link":"http://melborne.github.com/2013/01/24/csv-table-method-is-awesome/","count":"145","title":"Ruby標準添付ライブラリcsvのCSV.tableメソッドが最強な件につ..."}]);
+([{"link":"http://melborne.github.com/2012/04/09/to-newbie/","count":"1377","title":"これからRubyを始める人たちへ{content:'abc'}"},{"link":"http://melborne.github.com/2013/03/04/ruby-trivias-you-should-know-4/","count":"633","title":"知って得する！５５のRubyのトリビアな記法"},{"link":"http://melborne.github.com/2013/02/25/i-wanna-say-something-about-rubys-case/","count":"514","title":"Rubyのcaseを〇〇(言語名)のswitch文だと思っている人たちにぼ..."},{"link":"http://melborne.github.com/2011/06/22/21-Ruby-21-Trivia-Notations-you-should-know-in-Ruby/","count":"442","title":"知って得する21のRubyのトリビアな記法"},{"link":"http://melborne.github.com/2012/09/09/understand-js-oop-with-ruby-brain/","count":"435","title":"Ruby脳が理解するJavaScriptのオブジェクト指向"},{"link":"http://melborne.github.com/2012/12/25/ebooks-for-learning-ruby/","count":"269","title":"今年の冬休みに電子書籍であなたがRubyを習得しなければい..."},{"link":"http://melborne.github.com/2012/07/16/ruby-methods-analysis/","count":"236","title":"Ruby、君のオブジェクトはなんて呼び出せばいいの？"},{"link":"http://melborne.github.com/2013/01/21/why-fp-with-ruby/","count":"187","title":"Rubyを使って「なぜ関数プログラミングは重要か」を読み解..."},{"link":"http://melborne.github.com/2012/09/15/understand-js-oop-with-ruby-brain-2/","count":"178","title":"Ruby脳が理解するJavaScriptのオブジェクト指向（その２）"},{"link":"http://melborne.github.com/2013/01/24/csv-table-method-is-awesome/","count":"145","title":"Ruby標準添付ライブラリcsvのCSV.tableメソッドが最強な件につ..."}]);

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: hatebu_entry
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kyoendo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 description: HatebuEntry is a tool for retrieving and handling Hatena Bookmark entry
@@ -103,9 +103,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -133,17 +133,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Hatena bookmark entry list handler