Get_Set 1.1.1 → 1.2.0

data/Get_Set.gemspec

@@ -22,8 +22,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bacon"
   s.add_development_dependency "rake"
   s.add_development_dependency 'Bacon_Colored'
+  s.add_development_dependency 'pry'
   
   # s.rubyforge_project = "Get_Set"
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "Checked"
+  # s.add_runtime_dependency "Checked"
 end

data/README.md

@@ -17,29 +17,27 @@ Use:
     require "Get_Set"
 
     class Uni_Bash
+    
       include Get_Set::DSL
 
-      attr_get_set :name, :age
+      attr_get_set :name, :age, :homes, :var_and_block, :vars_and_block
+      
     end
 
-
     o = Uni_Bash.new
-    
+
     # --- Setters
     o.name "Uncle Martin"     
     o.age  190
-    
-    # ---- Getters
-    o.name             
-    o.age             
-
+    o.homes "Mars", "California"
+    o.var_and_block(:a) { :b }
+    o.vars_and_block(:a, :b, :c) { :d }
 
-Note
-----
-
-If you now of another gem that does the same thing, let me
-know through github: "Edit this file", submit project issue, or
-send me a message.  I always love to make my stuff obsolete so I can delete
-it and use something better.
+    # ---- Getters
+    o.name           # --> 'Uncle Martin
+    o.age            # --> 190
+    o.homes          # --> [ 'Mars', 'California' ]
+    o.var_and_block  # --> [ :a, Proc Instance ]
+    o.vars_and_block # --> [ [:a, :b, :c], Proc Instance ]</pre>
 
 

data/lib/Get_Set.rb

@@ -1,27 +1,42 @@
 require "Get_Set/version"
-require 'Checked'
 
 module Get_Set
   
   module DSL
     
-    include Checked::DSL
-
     def self.included klass
       klass.extend Class_Methods
     end
 
     module Class_Methods
       
-      include Checked::DSL
-      
-      def attr_get_set *names
-        Array!(names).symbols!
+      def attr_get_set *raw_names
+        names = raw_names.flatten.map(&:to_s).sort.map(&:to_sym)
         names.each { |n|
           class_eval %~
-            def #{n} *args
-              instance_variable_set( :@#{n}, nil ) unless instance_variable_defined?(:@#{n})
-              Get_Set! :@#{n}, *args
+            def #{n} *args, &blok
+            
+              if !args.empty? || block_given?
+              
+                final = case args.size
+                        when 1
+                          args.first
+                        when 0
+                          nil
+                        else
+                          args
+                        end
+                        
+                if block_given?       
+                  final = [final, blok].compact 
+                  final = final.first if final.size == 1
+                end
+                  
+                instance_variable_set( :@#{n}, final  )
+                
+              end
+              
+              instance_variable_get( :@#{n} )
             end
           ~, __FILE__, __LINE__
         }
@@ -29,18 +44,6 @@ module Get_Set
       
     end # === module Class_Methods
     
-    def Get_Set! *args
-      Size! args, 1..2
-      name = args.shift
-      raise ArgumentError, "Instance variable #{name.inspect} has not been defined." unless instance_variable_defined?(name)
-
-      if args.empty?
-        instance_variable_get name
-      else
-        instance_variable_set name, args.first
-      end
-    end
-    
   end # === module DSL
   
 end # === module Get_Set

data/lib/Get_Set/version.rb

@@ -1,3 +1,3 @@
 module Get_Set
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/main.rb

@@ -2,17 +2,7 @@
 require File.expand_path('spec/helper')
 require 'Get_Set'
 require 'Bacon_Colored'
-
-Klass = Class.new {
-  
-  include Get_Set::DSL
-  attr_get_set :name, :location
-
-  def initialize 
-    @name = 'Ultra Force'
-  end
-  
-}
+require 'pry'
 
 Dir.glob('spec/tests/*.rb').each { |file|
   require File.expand_path(file.sub('.rb', '')) if File.file?(file)

data/spec/tests/DSL.rb

@@ -1,60 +1,67 @@
 
+class Klassy
 
-describe "Get_Set! :@var" do
-  
-  before { extend Get_Set::DSL }
-  
-  it 'raises ArgumentError if instance variable has not been initialized.' do
-    lambda { Get_Set! :@something }
-    .should.raise(ArgumentError)
-    .message.should.match %r!@something has not been defined!
-  end
-  
-  it 'gets instance variable if array is empty.' do
-    @server = :hi
-    Get_Set!( :@server ).should == @server
+  include Get_Set::DSL
+  attr_get_set :name, :notify, :location
+
+  def initialize 
+    @name = 'Ultra Force'
   end
   
-end # === describe Get_Set!
+end # === Klassy
 
-describe "Get_Set! :@var, var" do
+describe "attr_get_set :var" do
   
-  before { extend Get_Set::DSL }
+  before { @klass = Klassy.new }
   
-  it 'raises ArgumentError if instance variable has not been initialized.' do
-    lambda { Get_Set! :@someg, :hi}
-    .should.raise(ArgumentError)
-    .message.should.match %r!@someg has not been defined!
+  it 'gets instance variable if no arguments given' do
+    t = 'Screaming Viking'
+    o = @klass
+    o.name t
+    o.name.should == t
   end
   
   it 'sets instance variable.' do
-    @server = :hi
-    Get_Set!( :@server, :bye)
-    @server.should == :bye
+    t = 'Quite Viking'
+    o = @klass
+    o.name t
+    o.instance_eval { @name }.should == t
   end
   
-  it 'returns last value' do
-    @server = :hi
-    Get_Set!( :@server, :bye ).should == :bye
+  it 'saves more than one argument as Array' do
+    t = [ :a, :b, :c]
+    @klass.name *t
+    @klass.name.should == t
   end
   
-end # === describe Get_Set!
-
-describe ":attr_get_set :name" do
-  
-  before { @klass = Klass.new }
-
   it 'defines method to retrieve value' do
     @klass.name.should == 'Ultra Force'
   end
   
   it 'defines method to set value' do
-    @klass.name(:Ultra)
+    @klass.name :Ultra
     @klass.name.should == :Ultra
   end
   
   it 'initializes variable to nil if not defined' do
     @klass.location.should == nil
   end
+
+  it 'saves proc given given to setter as its value' do
+    @klass.location {}
+    @klass.location.is_a?(Proc).should == true
+  end
+
+  it "saves value and proc given to setter as an array" do
+    b = Proc.new { :b }
+    @klass.location(:a, &b)
+    @klass.location.should == [:a, b]
+  end
+  
+  it "saves values and proc given to setter as an array within an array" do
+    c = Proc.new { :c }
+    @klass.location(:a, :b, &c)
+    @klass.location.should == [[:a, :b], c]
+  end
   
 end # === describe :attr_get_set :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Get_Set
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -60,14 +60,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: Checked
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false