property-accessor 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7d889a50003bc95523507b5f890335757113e753a1a0eab8fa7af4a09894e3
-  data.tar.gz: ad0dbc3ff7db1c41692759a1348e811287ae513b6e17db8c33e11ed9aceccb7c
+  metadata.gz: 656a96460b3704ee2a50e8bc6ac805c4a51269936a8c37c44e472db9566ba422
+  data.tar.gz: 7b3bb62aec91ad43555e2268c83d923a421972b0a5c46c1f140c23cc5a02b17f
 SHA512:
-  metadata.gz: dd60658a1e4330f1d387d27f7a5ca2805213750529344b22c4683c4dc432de8f3a4567fcf22f2b094c3d7d9118cc38b57901b63db300b12ac3ab4006ee900275
-  data.tar.gz: 042660f427218fabd8cbc9c77b7fb1e80dabcdee9b5529512e762bccd7b3ade2a4776aaabd4353c3cb81147909dc4b8c0cf8b0099135d8bdff1b715869bfbe73
+  metadata.gz: 05a363b9a6cb26535e9feff7a6c8b995f8a9db0cce37ea03eeb6c74fe99ec32fdfb43b0dc9bf19ad557bd655fd9902eeea8e3fb78c9365857efd77f8c33ff6da
+  data.tar.gz: 00b67a29759883132321d951d50d10df4ff9a7b671183ebb5e012aabe7731c40cf90a251429628787cb9ac0b488e260121e011abeda6716286c7db7df98581bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    property-accessor (0.1.0)
+    property-accessor (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -36,16 +36,14 @@ require 'date'
 class Person
   extend PropertyAccessor
 
-  property(:first_name) do
-    get { @name.upcase }
-    set { |val| @name = val }
-  end
-
-  property(:last_name)  { get; set }
-  property(:full_name)  { get { "#{first_name} #{last_name}" } }
-  property(:birth_date) { get; set { |val| @birth_date = Date.parse(val.to_s) } }
-  property(:age)        { get { (Time.now - birth_date.to_time).to_i / 60 / 60 / 24 / 365 } }
-  property(:meta)       { default { {} }; get }
+  property(:first_name)   { get { @name.upcase }; set(:family_name) { |val| @name = val } }
+  property(:last_name)    { get; set }
+  property(:full_name)    { get { "#{first_name} #{last_name}" } }
+  property(:birth_date)   { get; set { |val| @birth_date = Date.parse(val.to_s) } }
+  property(:age)          { get { (Time.now - birth_date.to_time).to_i / 60 / 60 / 24 / 365 } }
+  property(:confidential) { private get; public set; }
+  property(:middle_name)  { get(:get_middle_name); set(:set_middle_name); }
+  property(:meta)         { default { {} }; get }
 end
 
 p = Person.new

data/lib/property_accessor/class_methods.rb

@@ -9,15 +9,15 @@ module PropertyAccessor
       builder = PropertyBuilder.new(property)
 
       if block.nil?
-        raise UndefinedPropertyError, 'cannot define a proprty without specifing at least getter or setter'
+        raise UndefinedPropertyError, 'cannot define a property without specifying at least getter or setter'
       end
 
       builder.instance_exec(&block)
 
-      define_method("initialize_#{property.name}") do
-        if !instance_variable_defined?("@#{property.name}")
+      define_method(property.initializer_method_name) do
+        if !instance_variable_defined?(property.field_name)
           instance_variable_set(
-            "@#{property.name}",
+            property.field_name,
             property.default_value_proc ?
               instance_exec(&property.default_value_proc) :
               property.default_value
@@ -25,30 +25,39 @@ module PropertyAccessor
         end
       end
 
-      private "initialize_#{property.name}"
+      private property.initializer_method_name
 
       if property.getter_defined?
-        define_method(property.name) do
-          send("initialize_#{property.name}")
+        define_method(property.getter_method_name) do
+          send(property.initializer_method_name)
           instance_exec(&property.getter_proc)
         end
+      elsif property.default_getter
+        define_method(property.getter_method_name) do
+          send(property.initializer_method_name)
+          instance_variable_get(property.field_name)
+        end
       end
 
       if property.setter_defined?
-        define_method("#{property.name}=", property.setter_proc)
+        define_method(property.setter_method_name, property.setter_proc)
+      elsif property.default_setter
+        define_method(property.setter_method_name) do |val|
+          instance_variable_set(property.field_name, val)
+        end
       end
 
-      if property.default_getter
-        define_method(property.name) do
-          send("initialize_#{property.name}")
-          instance_variable_get("@#{property.name}")
-        end
+      property.private_method_names.each do |method_name|
+        private method_name
       end
 
-      if property.default_setter
-        attr_writer property.name
+      property.protected_method_names.each do |method_name|
+        protected method_name
       end
 
+      property.public_method_names.each do |method_name|
+        public method_name
+      end
     end
   end
 end

data/lib/property_accessor/property.rb

@@ -10,7 +10,14 @@ module PropertyAccessor
                   :default_getter,
                   :default_setter,
                   :default_value,
-                  :default_value_proc
+                  :default_value_proc,
+                  :setter_method_name,
+                  :getter_method_name,
+                  :initializer_method_name,
+                  :field_name,
+                  :public_method_names,
+                  :private_method_names,
+                  :protected_method_names
 
     def initialize(name)
       @name = name
@@ -21,6 +28,13 @@ module PropertyAccessor
       @default_value = nil
       @default_value_proc = nil
       @value = nil
+      @setter_method_name = "#{name}="
+      @getter_method_name = name
+      @field_name = "@#{name}"
+      @public_method_names = []
+      @private_method_names = []
+      @protected_method_names = []
+      @initializer_method_name = "__initialize_#{name}"
     end
 
     def setter_defined?

data/lib/property_accessor/property_builder.rb

@@ -3,6 +3,11 @@
 module PropertyAccessor
   class PropertyBuilder
 
+    private
+    attr_reader :property
+
+    public
+
     # @param property [PropertyAccessor::Property]
     def initialize(property)
       @property = property
@@ -10,26 +15,52 @@ module PropertyAccessor
 
     def default(value = nil, &block)
       if value
-        @property.default_value = value
+        property.default_value = value
       else
-        @property.default_value_proc = block
+        property.default_value_proc = block
       end
     end
 
-    def get(&block)
+    def private(method_name)
+      property.private_method_names << method_name
+    end
+
+    def protected(method_name)
+      property.protected_method_names << method_name
+    end
+
+    def public(method_name)
+      property.public_method_names << method_name
+    end
+
+    # @param method_name [String, Symbol] override getter method name
+    def get(method_name = nil, &block)
+      if method_name
+        property.getter_method_name = method_name
+      end
+
       if block
-        @property.getter_proc = block
+        property.getter_proc = block
       else
-        @property.default_getter = true
+        property.default_getter = true
       end
+
+      @property.getter_method_name
     end
 
-    def set(&block)
+    # @param method_name [String, Symbol] override setter method name
+    def set(method_name = nil, &block)
+      if method_name
+        property.setter_method_name = method_name
+      end
+
       if block
-        @property.setter_proc = block
+        property.setter_proc = block
       else
-        @property.default_setter = true
+        property.default_setter = true
       end
+
+      property.setter_method_name
     end
   end
 end

data/lib/property_accessor/version.rb

@@ -1,3 +1,3 @@
 module PropertyAccessor
-  VERSION = "0.1.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: property-accessor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Evgeny Stepanov