megalopolis 1.0 → 1.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1
+・最新版のsubjectからnext出来ないバグを修正
+・MHash構造体を採用
+・keyをidに変更
+
 ## 1.0
 
 * 正式リリース

data/lib/megalopolis.rb

@@ -19,8 +19,8 @@ class Megalopolis
   
   def get(args={})
     args[:log] ||= 0
-    if args.has_key?(:key)
-      Novel.new(@base_url, args[:log], args[:key])
+    if args.has_key?(:id)
+      Novel.new(@base_url, args[:log], args[:id])
     else
       Subject.new(@base_url, args[:log])
     end

data/lib/megalopolis/scheme.rb

@@ -1,15 +1,22 @@
 # coding: utf-8
 
-class Hash
-  def method_missing(action, *args)
-    return self[action.to_s] rescue nil
-  end
+class Megalopolis
+  class MHash < Hash
+    def initialize(params={})
+      self.update params
+    end
 
-  def params() self.keys.map{|k|k.to_sym} ; end
-end
+    def method_missing(action, *args)
+      stru = self[action] || self[action.to_s]
+      stru = MHash.new(stru) if stru.class == Hash
+      return stru
+    end
 
-class Megalopolis
-  class Novel
+    def params() self.keys.map{|k|k.to_sym} ; end
+    alias_method :available_methods, :params
+  end
+
+  class Novel < MHash
     include Essentials
     attr_reader :novel
     attr_reader :base_url
@@ -21,6 +28,7 @@ class Megalopolis
       @base_url = base_url
       @log = log
       @id = id
+      super(@novel)
     end
     
     def fetch_novel(base_url, log, id)
@@ -49,38 +57,18 @@ class Megalopolis
     end
     
     def plain
-      return self.body.gsub(/(<br>|\r?\n)/, "")
-    end
-
-    def method_missing(action, *args)
-      return @novel[action.to_s] rescue nil
-    end
-    
-    def params() @novel.keys.map{|k|k.to_sym} ; end
-    alias_method :available_methods, :params
-    
-    def to_hash
-      @novel
+      return self.body.gsub(/(<br>|\r?\n|\s)/, "")
     end
   end
   
-  class Index
+  class Index < MHash
     attr_reader :base_url
     attr_reader :index
 
     def initialize(base_url, index)
       @base_url = base_url
       @index = index
-    end
-
-    def method_missing(action, *args)
-      return @index[action.to_s] rescue nil
-    end
-    
-    def params() @index.keys.map{|k|k.to_sym} ; end
-    
-    def to_hash
-      @index
+      super(@index)
     end
 
     def fetch
@@ -99,7 +87,7 @@ class Megalopolis
       @subject = fetch_subject(base_url, log)
       super(subject)
       @base_url = base_url
-      @log = log
+      @log = @subject.first.log
     end
 
     def fetch_subject(base_url, log)

data/lib/megalopolis/version.rb

@@ -1,3 +1,3 @@
 class Megalopolis
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

data/spec/megalopolis_spec.rb

@@ -6,7 +6,7 @@ require "spec_helper"
 describe Megalopolis, "が #get, :log => 100 を呼ぶ時は" do
   before do
     m = Megalopolis.new("http://coolier.sytes.net/sosowa/ssw_l/")
-    @s = m.get :log => 100
+    @s = m.get :log => 0
   end
   
   it "Megalopolis::Subjectを返すこと" do
@@ -43,9 +43,9 @@ describe Megalopolis, "が #get, :log => 100 を呼ぶ時は" do
 
   it "直接Novelを取得出来ること" do
     log = @s.first.log
-    key = @s.first.key
+    id = @s.first.id
     m = Megalopolis.new("http://coolier.sytes.net/sosowa/ssw_l/")
-    novel = m.get :log => log, :key => key
+    novel = m.get :log => log, :id => id
     novel.class.should == Megalopolis::Novel
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megalopolis
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies: []
 description: Megalopolis API wrapper for Ruby
 email:
@@ -47,7 +47,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 270928971846965143
+      hash: -402405727754739227
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 270928971846965143
+      hash: -402405727754739227
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24