moosex 0.0.18 → 0.0.19

data/lib/moosex/attribute/modifiers.rb

@@ -1,10 +1,15 @@
 module MooseX
-  class Attribute
+  module AttributeModifiers
+    module ThirdParty
+    end
     module AttrBaseModifier
       def process(options, attr_symbol)
         @attr_symbol = attr_symbol
 
-        local_options = { name => default }.merge(options)
+        local_options = { 
+          name => default 
+        }.merge(options)
+        
         options.delete(name)
 
         return nil unless local_options.has_key?(name)
@@ -18,6 +23,7 @@ module MooseX
         attr
       end
 
+      def name; self.class.name.downcase.split("::").last.to_sym ; end
       def default; nil; end
       def coerce(x,f); x ; end
       def validate(x,f);  end
@@ -40,8 +46,8 @@ module MooseX
       def coerce(x, field_name)
         unless x.is_a? Proc
           x_name = x.to_sym
-          x = lambda do |object, *value|
-            object.send(x_name,*value)
+          x = ->(object, *value) do
+            object.__send__(x_name,*value)
           end
         end
 
@@ -58,7 +64,6 @@ module MooseX
     class Is 
       include AttrBaseModifier
       include AttrCoerceToSymbol
-      def name; :is ; end
       def default; :rw ; end
       def validate(is, field_name) 
         unless [:rw, :rwp, :ro, :lazy, :private].include?(is)
@@ -81,26 +86,23 @@ module MooseX
 
     class Isa 
       include AttrBaseModifier
-      def name; :isa ; end
       def default; MooseX::Attribute.isAny ; end
       def coerce(isa, field_name); MooseX::Attribute.isType(isa); end
     end
 
     class Default
       include AttrBaseModifier
-      def name; :default ; end
       def coerce(default, field_name)
         if default.is_a?(Proc) || default.nil?
           return default 
         end  
-        return lambda { default }         
+        return -> { default }         
       end
     end
 
     class Required
       include AttrBaseModifier
       include AttrCoerceToBoolean
-      def name; :required ; end
     end
 
     module AttrCoerceToMethodBasedOnFieldName
@@ -124,7 +126,6 @@ module MooseX
       include AttrBaseModifier
       include AttrCoerceToMethodBasedOnFieldName
 
-      def name; :predicate ; end
       def method_name(field_name); "has_#{field_name}?".to_sym ; end
     end       
 
@@ -132,13 +133,11 @@ module MooseX
       include AttrBaseModifier
       include AttrCoerceToMethodBasedOnFieldName
 
-      def name; :clearer ; end
       def method_name(field_name); "clear_#{field_name}!".to_sym ; end
     end
 
     class Handles
       include AttrBaseModifier
-      def name; :handles ; end
       def default; {} ; end
 
       def populate_handles(handles, field_name)
@@ -198,13 +197,11 @@ module MooseX
     class Lazy 
       include AttrBaseModifier
       include AttrCoerceToBoolean
-      def name; :lazy ; end
     end
 
     class Reader
       include AttrBaseModifier
-      include AttrCoerceToSymbol
-      def name; :reader ; end  
+      include AttrCoerceToSymbol 
       def default
         @attr_symbol
       end
@@ -213,7 +210,6 @@ module MooseX
     class Writter
       include AttrBaseModifier
       
-      def name; :writter ; end
       def default
         @attr_symbol.to_s.concat("=").to_sym
       end
@@ -228,18 +224,15 @@ module MooseX
       include AttrBaseModifier
       include AttrCoerceMethodToLambda
 
-      def name; :builder ; end
       def default
         "build_#{@attr_symbol}".to_sym
       end
     end
 
-    class InitArg
+    class Init_arg
       include AttrBaseModifier
       include AttrCoerceToSymbol
 
-      def name; :init_arg; end
-
       def default
         @attr_symbol
       end
@@ -249,11 +242,9 @@ module MooseX
     class Trigger
       include AttrBaseModifier
       include AttrCoerceMethodToLambda
-
-      def name; :trigger; end
       
       def default
-        lambda{|object, value| }
+        ->(object, value) { }
       end
     end
 
@@ -261,16 +252,14 @@ module MooseX
       include AttrBaseModifier
       include AttrCoerceMethodToLambda
 
-      def name; :coerce; end
-
       def default
-        lambda {|object| object}
+        ->(object) {object}
       end
 
       def update_options(options, name, attr)
         if options[:weak]
           old_coerce = attr
-          attr = lambda do |value|
+          attr = ->(value) do
             WeakRef.new old_coerce.call(value)
           end
         end
@@ -282,22 +271,32 @@ module MooseX
     class Weak
       include AttrBaseModifier
       include AttrCoerceToBoolean
-
-      def name; :weak ; end
     end
 
     class Doc
       include AttrBaseModifier
       include AttrCoerceToString
-
-      def name; :doc ; end
     end
 
     class Override
       include AttrBaseModifier
       include AttrCoerceToBoolean
+    end
+
+    class Traits
+      include AttrBaseModifier
+      def default; [] ; end
+      def coerce(traits,f)
+        original = ->(value) { value }
 
-      def name; :override ; end
+        [ traits ].flatten.inject(original) do |inner, trait|
+          ->(value) { trait.new inner.call value  }
+        end
+        
+      end
+      def validate(traits,f)
+        # TODO
+      end
     end
   end
 end

data/lib/moosex/event.rb

@@ -20,7 +20,7 @@ module MooseX
     has listeners: {
       is: :private,
       isa: isArray(EventListener),
-      default: lambda{ [] },
+      default: ->{ [] },
     }
 
     def has_events

data/lib/moosex/meta.rb

@@ -1,13 +1,14 @@
 module MooseX
 
   class Meta
-    attr_reader :attrs, :requires, :hooks
+    attr_reader :attrs, :requires, :hooks, :plugins
 
     def initialize(old_meta=nil)
       @initialized = false
       @attrs    = {}
       @requires = []
       @roles    = []
+      @plugins  = []
 
       @hooks = {
         before: Hash.new { |hash, key| hash[key] = [] },
@@ -20,6 +21,7 @@ module MooseX
           @attrs[key] = value.clone
         end
         @requires = old_meta.requires.clone
+        @plugins  = old_meta.plugins.clone
       end
     end
 
@@ -39,6 +41,7 @@ module MooseX
         @attrs[key] = value.clone
       end     
       @requires += other_meta.requires
+      @plugins  += other_meta.plugins
     end
     
     def load_from_klass(klass)
@@ -49,6 +52,7 @@ module MooseX
           @hooks[hook][m] += b.clone
         end
       end
+      @plugins  += other_meta.plugins
     end
 
     def add(attr)
@@ -111,6 +115,11 @@ module MooseX
         end 
       end
     end
+
+    def add_plugin(plugin)
+      @plugins << plugin.to_sym
+    end
+
     private
     def __moosex__init_hooks(method_name, method)
 
@@ -118,11 +127,11 @@ module MooseX
       after  = @hooks[:after][method_name]
       around = @hooks[:around][method_name]
 
-      original = lambda do |object, *args, &proc| 
+      original = ->(object, *args, &proc) do
         method.bind(object).call(*args, &proc)
       end 
 
-      lambda do |*args, &proc|
+      ->(*args, &proc) do
         before.each{|b| b.call(self,*args, &proc)}
         
         result = around.inject(original) do |lambda1, lambda2|

data/lib/moosex/traits.rb

@@ -0,0 +1,115 @@
+require 'delegate'
+
+module MooseX
+  module Traits
+    class Counter < SimpleDelegator
+      def initialize(value)
+        @value = value
+        super(@value)
+      end
+
+      def inc(by=1)
+        @value += by
+        __setobj__(@value)
+        @value
+      end
+      
+      def dec(by=1)
+        @value -= by
+        __setobj__(@value)
+        @value        
+      end
+
+      def reset(to=0)
+        @value = to
+        __setobj__(@value)
+        @value 
+      end
+    end
+
+    class Pair < SimpleDelegator
+      attr_reader :first, :second
+
+      def initialize(pair)
+        @first, @second = pair[0], pair[1]
+        super([@first, @second ])
+      end
+
+      def first=(first_value)
+        @first = first_value
+        __setobj__([@first, @second ])
+      end
+      def second=(second_value)
+        @second = second_value
+        __setobj__([@first, @second ])
+      end      
+    end
+
+    class Bool < SimpleDelegator
+      def initialize(value)
+        @value = value
+        super(value)
+      end  
+
+      def toggle!
+        @value = self.not
+        __setobj__(@value)
+      end
+
+      def set!
+        @value = true
+        __setobj__(@value)
+      end
+
+      def unset!
+        @value = false
+        __setobj__(@value)
+      end
+
+      def not
+        ! @value
+      end
+
+      def value
+        ! self.not
+      end      
+    end  
+
+    class RescueToNil < SimpleDelegator
+
+      def initialize(value)
+        @value = value
+        @default_value = -> { nil }
+        __setobj__(@value)
+      end
+
+      def method_missing(m, *args, &block)
+        begin
+          super(m, *args, &block)
+        rescue NoMethodError
+          @default_value.call
+        rescue Exception
+          raise
+        end  
+      end
+    end
+
+    class RescueToZero < RescueToNil
+
+      def initialize(value)
+        super(value)
+        @default_value = ->{ 0 }
+      end
+
+    end 
+
+    class RescueToEmptyString < RescueToNil
+
+      def initialize(value)
+        super(value)
+        @default_value = -> { "" }
+      end
+
+    end        
+  end
+end

data/lib/moosex/types.rb

@@ -182,7 +182,7 @@ module MooseX
 
       def isTuple(*types)
 
-        size_validation = lambda do |tuple|
+        size_validation = ->(tuple) do
           unless tuple.size == types.size
             raise TypeCheckError, "Tuple violation: size should be #{types.size} instead #{tuple.size}"
           end              
@@ -204,7 +204,7 @@ module MooseX
 
         proc = isAllOf(
             isArray(type),
-            lambda do |set|
+            ->(set) do
               if set.uniq.size != set.size
                 raise TypeCheckError, "Set violation: has one or more non unique elements"
               end 
@@ -218,7 +218,7 @@ module MooseX
       def create_individual_validations_for_tuples(types)
         individual_validations = []
         types.each_index do |index|        
-          individual_validations << lambda do |tuple|
+          individual_validations << ->(tuple) do
             begin
               isType(types[index]).call(tuple[index])
             rescue TypeCheckError => e

data/lib/moosex/version.rb

@@ -1,3 +1,3 @@
 module MooseX
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/samples/events.rb

@@ -20,7 +20,7 @@ class EventProcessor
   has event_handler: {
     is: :ro,
     isa: EventHandler,
-    default: lambda{ EventHandler.new },
+    default: -> { EventHandler.new },
     handles: {
       ping: { emit: :pinged },
       pong: { emit: :ponged },

data/samples/point.rb

@@ -16,7 +16,7 @@ class Point
 	has y: {
 		is: :rw,
 		isa: Integer,
-		default: lambda { 0 }, # you should specify a lambda
+		default: -> { 0 }, # you should specify a lambda
 	}
 
 	def clear! 

data/spec/baz_spec.rb

@@ -6,7 +6,7 @@ class Baz
 
     has bam: {
       is: :ro,             # read-only, you should specify in new only
-      isa: lambda do |bam| # you should add your own validator
+      isa: ->(bam) do      # you should add your own validator
           raise 'bam should be less than 100' if bam > 100
       end,
       required: true,