musashi 0.0.1 → 0.0.2

data/Rakefile

@@ -25,7 +25,6 @@ task :release => :build do
   system "git push origin master"
   system "git push origin v#{Musashi::VERSION}"
   system "gem push build/musashi-#{Musashi::VERSION}.gem"
-  system "gem push musashi-#{Musashi::VERSION}.gem"
 end
 
 desc 'Run the unit suite'

data/lib/musashi/error.rb

@@ -0,0 +1,11 @@
+class Musashi::Error < StandardError
+  class BadRequest < ::Musashi::Error; end
+  class Unauthorized < ::Musashi::Error; end
+  class Forbidden < ::Musashi::Error; end
+  class NotFound < ::Musashi::Error; end
+  class NotAcceptable < ::Musashi::Error; end
+  class InternalServer < ::Musashi::Error; end
+  class BadGateway < ::Musashi::Error; end
+  class ServiceUnavailable < ::Musashi::Error; end
+end
+

data/lib/musashi/publisher.rb

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 module Musashi::Publisher
 
-  def data
-    @data ||= {}
+  def attributes
+    @attributes ||= {}
   end
 
   def method_missing(sym,*args,&block)
@@ -10,17 +10,24 @@ module Musashi::Publisher
     match = /(?<field>.+)=$/.match(sym.to_s)
     super if match.nil? or match.size != 2
     field = match[:field] 
-    attrs[field] = data[field] = args.first
+    attrs[field] = attributes[field] = args.first
+  end
+
+  def update_attributes(fields)
+    self.attrs.merge!(fields)
+    self.attributes.merge!(fields)
   end
 
   def post(headers={})
-    marshall = ::Musashi::Publisher.marshalls[format] || WWWFormUrlencoded
-    payload, content_type = marshall.marshall(data)
-    headers = {} if headers.nil?
-    headers['Content-Type'] = content_type
+    payload, headers = post_or_put_prepare(headers)
     connection.post(connection.path_prefix, payload, headers)
   end
 
+  def put(headers={})
+    payload, headers = post_or_put_prepare(headers)
+    connection.put(connection.path_prefix, payload, headers)
+  end
+
   def self.marshalls
     @@marashalls ||= {}
   end
@@ -30,10 +37,19 @@ module Musashi::Publisher
   end
 
   module WWWFormUrlencoded
-    def self.marshall(data)
-      [data.to_query, 'www-form-urlencoded']
+    def self.marshall(attributes)
+      [attributes.to_query, 'www-form-urlencoded']
     end
   end
+
+  private 
+  def post_or_put_prepare(headers={})
+    marshall = ::Musashi::Publisher.marshalls[format] || WWWFormUrlencoded
+    payload, content_type = marshall.marshall(attributes)
+    headers = {} if headers.nil?
+    headers['Content-Type'] = content_type
+    [payload, headers]
+  end
  
 end
 

data/lib/musashi/retriever.rb

@@ -73,6 +73,14 @@ module Musashi::Retriever
       Strategist.define(receiver,name)
     end
 
+    def no_follow
+      @no_follow ||= []
+    end
+
+    def follow?(method)
+      not (method.nil? || no_follow.include?(method.to_s) || no_follow.include?(method))
+    end
+
   end
 
   module VisitorStrategist
@@ -94,7 +102,7 @@ module Musashi::Retriever
       return nil unless self.has_key?(key)
       value = self.fetch(key.to_s) rescue self.fetch(key) rescue nil
       return value if value.nil?
-      define value,key.to_sym
+      define value,key.to_sym if follow?(key)
       value
     end
 
@@ -113,7 +121,7 @@ module Musashi::Retriever
       value = self.fetch(sym.to_s) rescue self.fetch(sym) rescue nil
       return value if value.nil?
 
-      define value, sym
+      define value, sym if follow?(sym)
       value
     end
 

data/lib/musashi/version.rb

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

data/spec/publisher_spec.rb

@@ -7,15 +7,16 @@ describe Musashi::Publisher do
     @resource = Musashi::Resource.new('http://foo.bar/')
     FakeWeb.register_uri(:get,  @resource.endpoint, :body => '{"foo":"bar","name":"bazz"}')
     FakeWeb.register_uri(:post, @resource.endpoint, :payload => 'name=bar')
+    FakeWeb.register_uri(:post, @resource.endpoint, :payload => {'name'=> 'foo','foo'=> 'bazz'}.to_query)
   end
 
   it 'should known what fields are dirty' do
     @resource.attrs.size.should == 2
-    @resource.data.should be_empty
+    @resource.attributes.should be_empty
     @resource.name.should eq('bazz')
     @resource.name = 'bar'
     @resource.name.should eq('bar')
-    @resource.data.size.should == 1
+    @resource.attributes.size.should == 1
   end
 
   it 'should post ony fields are dirty' do
@@ -25,5 +26,14 @@ describe Musashi::Publisher do
     @resource.post
   end
 
+  it 'should update atributes' do
+    @resource.name.should eq('bazz')
+    @resource.foo.should eq('bar')
+    @resource.update_attributes({'name'=> 'foo', 'foo'=> 'bazz'})
+    @resource.attributes['name'].should eq('foo')
+    @resource.name.should eq('foo')
+    @resource.foo.should eq('bazz')
+  end
+
 end
 

data/spec/retriever_visitor_spec.rb

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe Musashi::Retriever::Strategist do
+
+  describe 'by behavior' do
+
+    it 'should define a Retriever for Array' do
+      Musashi::Retriever::Strategist.define(array = [])
+      array.should be_kind_of Musashi::Retriever::Iterator
+    end
+
+    it 'should define a Retriever for url' do
+      Musashi::Retriever::Strategist.define(url = 'http://foo.bar/')
+      url.should be_kind_of Musashi::Retriever::Content
+    end
+
+    it 'should define a Retriever for hash' do
+      Musashi::Retriever::Strategist.define(hash = {})
+      hash.should be_kind_of Musashi::Retriever::VisitorStrategist
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musashi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000Z
+date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &9140160 !ruby/object:Gem::Requirement
+  requirement: &13234000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *9140160
+  version_requirements: *13234000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &9139460 !ruby/object:Gem::Requirement
+  requirement: &13228720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *9139460
+  version_requirements: *13228720
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &9138420 !ruby/object:Gem::Requirement
+  requirement: &13228160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *9138420
+  version_requirements: *13228160
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &9137720 !ruby/object:Gem::Requirement
+  requirement: &13227660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.4
   type: :runtime
   prerelease: false
-  version_requirements: *9137720
+  version_requirements: *13227660
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &9123940 !ruby/object:Gem::Requirement
+  requirement: &13227120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *9123940
+  version_requirements: *13227120
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &9123480 !ruby/object:Gem::Requirement
+  requirement: &13226560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9123480
+  version_requirements: *13226560
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &9123020 !ruby/object:Gem::Requirement
+  requirement: &13226060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *9123020
+  version_requirements: *13226060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9122220 !ruby/object:Gem::Requirement
+  requirement: &13225120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *9122220
+  version_requirements: *13225120
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &9121760 !ruby/object:Gem::Requirement
+  requirement: &13224480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *9121760
+  version_requirements: *13224480
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &9121260 !ruby/object:Gem::Requirement
+  requirement: &13223720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,7 +120,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *9121260
+  version_requirements: *13223720
 description: ! 'Musashi is a library for '
 email: pahagon@gmail.com
 executables: []
@@ -135,6 +135,7 @@ files:
 - lib/musashi/resource.rb
 - lib/musashi/connection.rb
 - lib/musashi/retriever.rb
+- lib/musashi/error.rb
 - lib/musashi/version.rb
 - lib/musashi/publisher.rb
 - lib/musashi.rb
@@ -142,6 +143,7 @@ files:
 - lib/faraday/response/raise_http_4xx.rb
 - spec/connection_spec.rb
 - spec/spec_helper.rb
+- spec/retriever_visitor_spec.rb
 - spec/publisher_spec.rb
 - spec/retriever_base_spec.rb
 - spec/resource_spec.rb
@@ -176,13 +178,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: musashi
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Musashi is a library for
 test_files:
 - spec/connection_spec.rb
 - spec/spec_helper.rb
+- spec/retriever_visitor_spec.rb
 - spec/publisher_spec.rb
 - spec/retriever_base_spec.rb
 - spec/resource_spec.rb