bzproxies 0.0.1 → 0.0.2

data/lib/bzproxies/owner.rb

@@ -9,21 +9,20 @@ module Proxies
     
     module ClassMethods
       def proxy_reader(*args)
-        (load_options args.pop) if args.last.kind_of? Hash
+        args.pop if args.last.kind_of? Hash
         attr_reader *args
       end
       
       def proxy_writer(*args)
-        load_options :proxy => Proxy
-        (load_options args.pop) if args.last.kind_of? Hash
-        raise ArgumentError, "Unexpected proxy class. Expected 'Class'" unless @proxy.respond_to? :new
+        proxy = (args.pop[:proxy] if args.last.kind_of? Hash) || Proxies::Base
+        raise ArgumentError, "Unexpected proxy class. Expected class, given #{proxy.inspect}" unless proxy.respond_to? :new
         args.each do |name|
           raise ArgumentError, "Unexpected argument. Expected String or Symbol" unless name.kind_of? String or name.kind_of? Symbol
           define_method("#{name}=") do |v|
             if v.stub?
               val = v
             else
-              val = (self.class.instance_variable_get :@proxy).send :new, v
+              val = proxy.send :new, v
             end
             instance_variable_set("@#{name}", val)
           end
@@ -35,17 +34,6 @@ module Proxies
         proxy_writer(*args)
       end      
       
-      protected
-      
-      def load_options opts
-        opts.each_pair do |key, val|
-          metaclass = class << self; self; end
-          metaclass.send :attr_reader, key
-          instance_variable_set "@#{key}", val
-        end
-        self
-      end
-      
     end
 
   end

data/lib/bzproxies/version.rb

@@ -1,3 +1,3 @@
 module Bzproxies
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fixtures/owner.rb

@@ -16,15 +16,20 @@ class Ex2
   end
 end
 
-class Ex3
-  include Proxies::Owner
-  proxy_accessor :test
+class MyProxy1 < Proxy
+  def check
+    return ::MyProxy1
+  end
 end
-
-class Ex4
-  include Proxies::Owner
+  
+class MyProxy2 < Proxy
+  def check
+    return ::MyProxy2
+  end
 end
 
-class Ex5
-  include Proxies::Stub
+class Ex3
+  include Proxies::Owner
+  proxy_accessor :test1, :proxy => MyProxy1
+  proxy_accessor :test2, :proxy => MyProxy2
 end

data/spec/owner_spec.rb

@@ -7,19 +7,6 @@ describe Proxies::Owner do
     expect {Ex2.new}.not_to raise_error
   end
   
-  it "creates singleton private class attr_reader and variables from hash" do
-    Ex4.send :load_options, :test => "test"
-    (Ex4.send :test).should == "test"
-  end
-  
-  it "sets new value, when variable exists" do
-    a = "test"
-    Ex4.send :load_options, :test => "test"
-    (Ex4.send :test).should == "test"
-    Ex4.send :load_options, :test => "test2"
-    (Ex4.send :test).should == "test2"
-  end
-  
   describe "proxy_reader" do    
     it "creates proxy object attr_accessor" do
       a = "source"
@@ -28,14 +15,10 @@ describe Proxies::Owner do
       owner.test = Proxy.new(a)
       owner.test.proxy?.should be_true  #testing method
     end
-    
-    it "gets options hash" do
-      (Ex1.send :proxy).should == Proxies::Base
-    end
   end
   
   describe "proxy_writer" do
-    it "creates attr writes method" do
+    it "creates attr write method" do
       owner = Ex2.new
       owner.methods.should include :test=
     end
@@ -58,6 +41,15 @@ describe Proxies::Owner do
     end
   end
   
+  it "could have it's own proxy for each attribute" do
+    owner = Ex3.new
+    owner.test1 = "test"
+    owner.test2 = "test"
+    
+    owner.test1.check.should == MyProxy1
+    owner.test2.check.should == MyProxy2
+    
+  end
   
   
 end

metadata

@@ -2,7 +2,7 @@
 name: bzproxies
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Bombazook
@@ -57,7 +57,6 @@ files:
 - lib/bzproxies/stub.rb
 - lib/bzproxies/version.rb
 - spec/base_spec.rb
-- spec/basic_object_spec.rb
 - spec/fixtures/base.rb
 - spec/fixtures/owner.rb
 - spec/owner_spec.rb

data/spec/basic_object_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe BasicObject do
-  
-end