ugigi 0.3.3 → 0.4

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.4
+
+* gem非依存になりました。
+* Spec追加
+* list_count APIに対応
+* Mylist APIに完全対応
+
 ## 0.3.1 - 0.3.3
 * バグ修正
 

data/README.md

@@ -1,11 +1,10 @@
 # Ugigi
 
-Ugigi Wrapper for Ruby 1.9.x
+Ugigi Wrapper for Ruby
 
 ## Requirements
 
-* Ruby 1.9.x
-* mechanize gem
+* Ruby
 
 ## Installation
 
@@ -28,6 +27,9 @@ Ugigi Wrapper for Ruby 1.9.x
 	# "にとり"が文章中に含まれているSSの数を持ってくる
 	puts Ugigi.total_count(:free => "にとり")
 
+	# 東方創想話に限定して検索
+	puts Ugigi.search(:title => "霊夢", :only => :sosowa)
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,2 +1,5 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new('spec')

data/lib/ugigi.rb

@@ -1,5 +1,7 @@
+# coding: utf-8
+
 require "kconv"
-require "mechanize"
+require "net/http"
 require "time"
 require "json"
 require "uri"
@@ -7,15 +9,13 @@ require "uri"
 $LOAD_PATH.unshift(File.expand_path("../", __FILE__))
 require "ugigi/version"
 require "ugigi/scheme"
-require "ugigi/parser"
 
 module Ugigi
-  BASE_URL = "http://ugigi.dvrdns.org/api/search/list.json"
-  BASE_URL_NOAPI = "http://ugigi.dvrdns.org/search"
+  BASE_URL = "http://ugigi.dvrdns.org/api/"
   
   protected
   
-  def self.serialize_parameter parameter
+  def self.serialize_parameter(parameter={})
     return "" unless parameter.class == Hash
     ant = Hash.new
     parameter.each do |key, value|
@@ -24,16 +24,73 @@ module Ugigi
     param = ant.inject(""){|k,v|k+"&#{v[0]}=#{URI.escape(v[1])}"}.sub!(/^&/,"?")
     return param ? param : ""
   end
+
+  def self.send_req(path, params={})
+    uri = URI.join(BASE_URL, path, serialize_parameter(params))
+    response = Net::HTTP.get_response(uri)
+    return JSON.parse(response.body)
+  end
   
   public
-  
+
   def self.search(args={})
-    parser = Parser.new
-    parser.fetch(args)
+    case args[:only]
+    when :sosowa
+      args = args.update(:sswp => 0, :compe => 0)
+    when :compe
+      args = args.update(:sswl => 0, :sswp => 0)
+    when :sswp
+      args = args.update(:sswl => 0, :compe => 0)
+    end
+    args.delete(:only) if args.has_key? :only
+    data = send_req("search/list.json", args)
+    indexes = []
+    data.each do |e|
+      index = Index.new(e)
+      case args[:style]
+      when :sosowa
+        index.element = index.to_sosowa_index
+        indexes << index
+      else
+        indexes << index
+      end
+    end
+    return indexes
   end
-  
-  def self.total_count(args)
-    parser = Parser.new
-    parser.total_count(args)
+
+  def self.total_count(args={})
+    data = send_req("search/list_count.json", args)
+    return data["count"]
+  end
+
+  def self.mylist(args={})
+    data = send_req("list/get", args)
+    indexes = []
+    data.each do |e|
+      index = Index.new(e)
+      case args[:style]
+      when :sosowa
+        index.element = index.to_sosowa_index
+        indexes << index
+      else
+        indexes << index
+      end
+    end
+    return indexes
+  end
+
+  def self.mylist_add(args={})
+    data = send_req("list/add", args)
+    return data
+  end
+
+  def seld.mylist_remove(args={})
+    data = send_req("list/rem", args)
+    return data
+  end
+
+  def seld.mylist_edit(args={})
+    data = send_req("list/edit", args)
+    return data
   end
 end

data/lib/ugigi/scheme.rb

@@ -1,6 +1,10 @@
 module Ugigi
   class Scheme
     attr_accessor :element
+
+    def initialize(element)
+      @element = element
+    end
     
     def method_missing(action, *args)
       return @element[action.to_s] rescue nil
@@ -10,11 +14,7 @@ module Ugigi
     alias_method :available_methods, :params
   end
   
-  class Index < Scheme
-    def initialize(element)
-      @element = element
-    end
-    
+  class Index < Scheme    
     def to_sosowa_index
       log = @element["link"].scan(/log=(\d+)/)[0][0].to_i
       key = @element["link"].scan(/key=(\d+)/)[0][0].to_i

data/lib/ugigi/version.rb

@@ -1,3 +1,3 @@
 module Ugigi
-  VERSION = "0.3.3"
+  VERSION = "0.4"
 end

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+$LOAD_PATH << File.expand_path("../../../lib", __FILE__)
+require "ugigi"
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

data/spec/ugigi_spec.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+require "spec_helper"
+require "pp"
+
+describe Ugigi, "が #search を呼ぶ時は" do
+  before do
+    @free_search_result = Ugigi.search(:free => "霊夢")
+  end
+  
+  it "Array を返すこと" do
+    @free_search_result.class.should == Array
+  end
+
+  it "配列の中身が全て Ugigi::Index であること" do
+    @free_search_result.each do |i|
+      i.class.should == Ugigi::Index
+    end
+  end
+end
+
+describe Ugigi, "が #total_count を呼ぶ時は" do
+  before do
+    @total_count_result = Ugigi.total_count(:free => "霊夢")
+  end
+  
+  it "Fixnum を返すこと" do
+    @total_count_result.class.should == Fixnum
+  end
+end

data/ugigi.gemspec

@@ -14,5 +14,4 @@ Gem::Specification.new do |gem|
   gem.name          = "ugigi"
   gem.require_paths = ["lib"]
   gem.version       = Ugigi::VERSION
-  gem.add_dependency "mechanize"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ugigi
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mechanize
-  requirement: &70150130472260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70150130472260
+date: 2012-08-29 00:00:00.000000000 Z
+dependencies: []
 description: Ugigi Wrapper for Ruby
 email:
 - oame@oameya.com
@@ -30,15 +19,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/ugigi.rb
-- lib/ugigi/parser.rb
 - lib/ugigi/scheme.rb
 - lib/ugigi/version.rb
+- spec/spec_helper.rb
+- spec/ugigi_spec.rb
 - ugigi.gemspec
 homepage: ''
 licenses: []
@@ -60,9 +52,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ugigi Wrapper for Ruby 1.9.x
-test_files: []
-has_rdoc: 
+test_files:
+- spec/spec_helper.rb
+- spec/ugigi_spec.rb

data/lib/ugigi/parser.rb

@@ -1,43 +0,0 @@
-# coding: utf-8
-
-module Ugigi
-  class Parser
-    def initialize
-      @agent = Mechanize.new
-      @agent.user_agent = "Ugigi Ruby #{Ugigi::VERSION}"
-    end
-
-    def fetch(args)
-      case args[:only]
-      when :sosowa
-        args = args.update(:sswp => 0, :compe => 0)
-      when :compe
-        args = args.update(:sswl => 0, :sswp => 0)
-      when :sswp
-        args = args.update(:sswl => 0, :compe => 0)
-      end
-      args.delete(:only) if args.has_key? :only
-      params = Ugigi.serialize_parameter(args)
-      page = @agent.get(URI.join(BASE_URL, params))
-      data = JSON.parse(page.body)
-      indexes = []
-      data.each do |e|
-        index = Index.new(e)
-        case args[:style]
-        when :sosowa
-          index.element = index.to_sosowa_index
-          indexes << index
-        else
-          indexes << index
-        end
-      end
-      return indexes
-    end
-    
-    def total_count(args)
-      params = Ugigi.serialize_parameter(args)
-      page = @agent.get(URI.join(BASE_URL_NOAPI, params))
-      return page.search(%{div[@class="info"]}).children[0].text.strip.split("/")[1].to_i
-    end
-  end
-end