musashi 0.0.1.b1 → 0.0.1.b4

data/lib/musashi/resource.rb

@@ -49,7 +49,7 @@ class Musashi::Resource
 
   end
 
-  include ::Musashi::Retriever::DelegateHash
+  include ::Musashi::Retriever
   def initialize(url,options={})
     raise ArgumentError.new('Undefined url') if url.nil? or url.empty?
     resource_type = Format.formats[ options[:format] || :json ]

data/lib/musashi/retriever.rb

@@ -60,7 +60,7 @@ module Musashi::Retriever
       receiver.extend retriever
     end
 
-    def define(receiver,name=nil)
+    def self.define(receiver,name=nil)
       raise "Undefined receiver" if receiver.nil?
       if name.nil?
         Strategist.define_by_behavior receiver
@@ -74,6 +74,10 @@ module Musashi::Retriever
       end
     end
 
+    def define(receiver,name=nil)
+      Strategist.define(receiver,name)
+    end
+
   end
 
   module VisitorStrategist
@@ -81,11 +85,13 @@ module Musashi::Retriever
     include Strategist
 
     def self.extend?(receiver)
-      !receiver.nil? && receiver.respond_to?(:keys) && receiver.respond_to?(:fetch)
+      !receiver.nil? && receiver.respond_to?(:keys) && \
+      receiver.respond_to?(:fetch) && !receiver.is_a?(VisitorStrategist)
     end
 
     def self.extend_object(receiver)
-      raise RuntimeError.new unless extend? receiver
+      return if receiver.is_a?(VisitorStrategist)
+      raise RuntimeError.new unless VisitorStrategist.extend? receiver
       super
     end
 
@@ -154,11 +160,13 @@ module Musashi::Retriever
     include DelegateHash
 
     def self.extend?(receiver)
-      !receiver.nil? && receiver.respond_to?(:start_with?) && receiver.start_with?('http')
+      !receiver.nil? && receiver.respond_to?(:start_with?) && \
+      receiver.start_with?('http') && !receiver.is_a?(Content)
     end
 
     def self.extend_object(receiver)
-      raise RuntimeError.new unless extend? receiver
+      return if receiver.is_a?(Content)
+      raise RuntimeError.new unless Content.extend? receiver
       super
     end
 
@@ -171,14 +179,13 @@ module Musashi::Retriever
 
   module Iterator
     def self.extend?(receiver)
-      !receiver.nil? && receiver.is_a?(::Array)
+      !receiver.nil? && receiver.is_a?(::Array) && !receiver.is_a?(Iterator)
     end
 
     def self.extend_object(receiver)
-      raise RuntimeError.new unless extend? receiver
-      receiver.each do |item|
-        item.extend VisitorStrategist
-      end
+      return if receiver.is_a?(Iterator)
+      raise RuntimeError.new unless Iterator.extend? receiver
+      receiver.each{ |item| Strategist.define(item) }
     end
   end
 

data/lib/musashi/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module Musashi
-  VERSION = "0.0.1.b1"
+  VERSION = "0.0.1.b4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musashi
 version: !ruby/object:Gem::Version
-  version: 0.0.1.b1
+  version: 0.0.1.b4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &8196940 !ruby/object:Gem::Requirement
+  requirement: &13405480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *8196940
+  version_requirements: *13405480
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &8196300 !ruby/object:Gem::Requirement
+  requirement: &13404940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *8196300
+  version_requirements: *13404940
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &8195460 !ruby/object:Gem::Requirement
+  requirement: &13404200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *8195460
+  version_requirements: *13404200
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &8194660 !ruby/object:Gem::Requirement
+  requirement: &13403520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *8194660
+  version_requirements: *13403520
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &8194040 !ruby/object:Gem::Requirement
+  requirement: &13402800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *8194040
+  version_requirements: *13402800
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &8193280 !ruby/object:Gem::Requirement
+  requirement: &13402060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *8193280
+  version_requirements: *13402060
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &8192780 !ruby/object:Gem::Requirement
+  requirement: &13401580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *8192780
+  version_requirements: *13401580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8191840 !ruby/object:Gem::Requirement
+  requirement: &13400880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8191840
+  version_requirements: *13400880
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &8188320 !ruby/object:Gem::Requirement
+  requirement: &13400380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8188320
+  version_requirements: *13400380
 description: ! 'Musashi is a library for '
 email: pahagon@gmail.com
 executables: []