oop 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb9d1bf13e5c147e22eefb62768d3bfdc9bb5a38
-  data.tar.gz: a5f6928033fccdc27467099fd810df0a8155e27f
+  metadata.gz: 2aaca8a6b423ff2bccc411180331c5c8c1be89ff
+  data.tar.gz: 19fee614c4f7c83a4201230669fb736d5657025e
 SHA512:
-  metadata.gz: ef4a599ef3f32cbc7707bdafa193ba20f2e60384966b2146b0c4ce818e5e33b455b09295f2a5087e266ca6464eeac1837d2322cb7465bd8e3efcefe3c8376a22
-  data.tar.gz: 1711dc7c27cbdc2f3c0167ea50a1d3b28d40a741a48528feafa193615e48ad1385d29dfab6d096961d6a862e334d0193ea7fb4450255b68d8b81e409d0d0954c
+  metadata.gz: 4e38453713fe1d67ed64443835e8db36341852e00e59201ba4720d8d62660a14f7e39bc59d2558432b27ec88a896a74b62297c31074453fd5665306d3020dc08
+  data.tar.gz: 32cddc73ed98d112b2a4e1a560ec0576be8bf7be6aee183ac3b247930d82cec4ae72710eea5d783a80003e3dd7d9f2c3d9ac10d1e9fa052a0d4118a069d179b5

data/lib/oop/basic_rules.rb

@@ -3,16 +3,22 @@ require 'oop/value'
 
 module OOP
   class BasicRules
-    def trusted_values
-      []
+    def self.instance
+      @instance ||= new
+    end
+
+    def self.cast_to_value(arg)
+      self.instance.cast_to_value(arg)
     end
 
     def cast_to_value(arg)
+      if arg.respond_to?(:super_mega_private_oop_method_valid?) && arg.super_mega_private_oop_method_valid?
+        return arg
+      end
+
       case arg
       when Value, TrueClass, FalseClass, NilClass, Proc then
         arg
-      when *trusted_values
-        arg
       when Hash then
         Hash[arg.map{|k,v| [cast_to_value(k), cast_to_value(v)] }.to_h].freeze
       when Array then

data/lib/oop/ext.rb

@@ -1,14 +1,10 @@
 require 'oop/basic_rules'
 require 'oop/value_provider'
+require 'oop/value_interface'
 require 'oop/value_communications'
 
 class Class
-  def acts_as_value(rules = OOP::BasicRules.new, provider = OOP::ValueProvider.new)
+  def acts_as_value
     include OOP::ValueCommunications
-    value_caster rules
-    value_provider provider
-    define_singleton_method :constructor do |*parts, &block|
-      value_contructor(rules, *parts, &block)
-    end
   end
 end

data/lib/oop/value_communications.rb

@@ -1,33 +1,26 @@
 require 'oop/basic_rules'
-require 'oop/value_provider'
 
 module OOP
   module ValueCommunications
     module ClassMethods
-      def value_caster(new_caster)
-        @value_caster = new_caster
-      end
-      def value_provider(new_provider)
-        @value_provider = new_provider
-      end
       def message(meth, &block)
         define_method(meth) do |*args, &blk|
           args = args.map do |arg|
-            value_caster.cast_to_value(arg)
+            BasicRules.cast_to_value(arg)
           end
-          value_caster.cast_to_value(self.instance_exec(*(args + [blk]), &block))
+          BasicRules.cast_to_value(self.instance_exec(*(args + [blk]), &block))
         end
       end
 
-      def import(*imports)
-        imports.each do |import|
-          define_method(import.to_sym) do
-            value_provider.send(import)
+      def import(imports)
+        imports.each do |name, import|
+          define_method(name.to_sym) do
+            BasicRules.cast_to_value(import)
           end
         end
       end
 
-      def value_contructor(rules, *parts, &block)
+      def constructor(*parts, &block)
         define_method(:initialize) do |opts={}|
           opts ||= {}
           if block
@@ -45,7 +38,7 @@ module OOP
           @opts = opts;
           opts.each do |k, v|
             k = k.to_sym
-              @opts[rules.cast_to_value(k)] = rules.cast_to_value(v)
+            @opts[BasicRules.cast_to_value(k)] = BasicRules.cast_to_value(v)
           end
         end
         parts.each do |p|
@@ -54,27 +47,14 @@ module OOP
           end
         end
       end
+    end
 
-      def get_value_provider
-        @value_provider || ValueProvider.new
-      end
-      def get_value_caster
-        @value_caster || BasicRules.new
-      end
+    def super_mega_private_oop_method_valid?
+      true
     end
 
     def self.included(klass)
       klass.extend(ClassMethods)
     end
-
-    private
-
-    def value_caster
-      self.class.get_value_caster
-    end
-
-    def value_provider
-      self.class.get_value_provider
-    end
   end
 end

data/lib/oop/value_interface.rb

@@ -0,0 +1,7 @@
+module OOP
+  module ValueInterface
+    def super_mega_private_oop_method_valid?
+      true
+    end
+  end
+end

data/lib/oop/version.rb

@@ -1,3 +1,3 @@
 module OOP
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oop
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Serguei Filimonov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,6 +78,7 @@ files:
 - lib/oop/tools.rb
 - lib/oop/value.rb
 - lib/oop/value_communications.rb
+- lib/oop/value_interface.rb
 - lib/oop/value_provider.rb
 - lib/oop/version.rb
 - oop.gemspec