defgen 0.0.1 → 0.0.2

data/README.md

@@ -49,6 +49,44 @@ The DSL should be pretty self explanatory call the `type` of the object followed
 
 ###Customisation
 
+Sometimes you want to have a different getter so you can follow conventions like having a boolean `isValid` and `setValid:`, which sounds nicer than `isValid` and `setIsValid:`
+
+Simple...
+
+    bool 'valid', :getter => 'isValid'
+  
+which generates
+
+    // NSUserDefaults+PASProperties.h
+    
+    @property (nonatomic, assign, getter=pas_isValid) BOOL pas_valid;
+    
+    // NSUserDefaults+PASProperties.m
+    
+    - (BOOL)pas_isValid;
+    {
+      return [self boolForKey:PASValid];
+    }
+
+    - (void)setPas_valid:(BOOL)isValid;
+    {
+      [self setBool:isValid forKey:PASValid];
+    }
+    
+---
+
+If you don't like my choice of using `strong` for object properties you can override this in the same way
+
+    array 'colours', :ownership => :weak
+    
+which generates
+
+    // NSUserDefaults+PASProperties.h
+    
+    @property (nonatomic, weak) NSArray *pas_colours;
+
+###Advanced Customisation
+
 If you don't like the supplied boiler plate then you can tweak it.
 
 ####Step 1. Call generate the stubs
@@ -143,8 +181,7 @@ This will generate the templates in your current project so that you can edit as
 
 ##Wish List
 
-- Support for provising customer getter e.g. `(nonatomic, strong, getter=isValid)`
-- Support for overriding ownership qualifiers
+- Dry runs to show what will be generated
 
 ##Licence
 

data/lib/defgen/cli.rb

@@ -11,10 +11,9 @@ module Defgen
       
     desc "parse", 'Parse a "Defaultfile" and modify the Xcodeproj'
     method_option :filename, default: 'Defaultfile', 
-    aliases: '-f',
-    desc:    'Specify the input file path'
+                             aliases: '-f',
+                             desc:    'Specify the input file path'
     def parse
-      
       path = Dir['*.xcodeproj'].first
       
       if path.nil?

data/lib/defgen/decorators/getter_decorator.rb

@@ -10,6 +10,14 @@ module Defgen
       super.downcase
     end
     
+    def parameter
+      if attributes.getter.nil? || attributes.getter.empty?
+        super
+      else
+        attributes.getter
+      end
+    end
+    
     def get_binding
       binding
     end

data/lib/defgen/defaultfile_parser.rb

@@ -20,13 +20,14 @@ module Defgen
       [ 'double',     'double',     'double ',        :assign, false ],
       [ 'url',        'URL',        'NSURL *',        :strong, false ]
     ].each do |method_name, prefix, objc_type, ownership, object_setter|
-      define_method method_name do |name|
+      define_method method_name do |name, options={}|
         Property.new do |property, attributes|
           property.name           = name
           property.object_setter  = object_setter
           property.message_prefix = prefix
           property.objc_type      = objc_type
-          attributes.ownership    = ownership
+          attributes.ownership    = options[:ownership] || ownership
+          attributes.getter       = options[:getter]
           
           @properties << property
         end

data/lib/defgen/property.rb

@@ -5,6 +5,7 @@ module Defgen
         
     def initialize
       self.attributes = Attributes.new
+      self.attributes.property = self
       yield self, attributes if block_given?
     end
         

data/lib/defgen/property/attributes.rb

@@ -3,7 +3,7 @@ module Defgen
     class UnsupportedOwnershipError < ArgumentError; end
     class Attributes
       VALID_OWNERSHIPS = [:strong, :weak, :assign, :unsafe_unretained, :retain, :copy]
-      attr_accessor :ownership
+      attr_accessor :ownership, :getter, :property
       
       def initialize
         @ownership = :strong
@@ -22,7 +22,13 @@ module Defgen
       end
       
       def to_s
-        "(#{['nonatomic', ownership].compact.join(', ')})"
+        "(#{['nonatomic', ownership, formatted_getter].compact.join(', ')})"
+      end
+      
+      def formatted_getter
+        unless getter.nil? || getter.empty?
+          "getter=#{property.prefix.downcase}_#{getter}"
+        end
       end
     end
   end

data/lib/defgen/version.rb

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

data/spec/unit/decorators/getter_decorator_spec.rb

@@ -27,5 +27,10 @@ module Defgen
       @property.prefix = 'PS'
       decorator.prefix.should eq('ps')
     end
+    
+    it "uses a custom getter" do
+      @property.attributes.getter = 'isValid'
+      decorator.parameter.should eq('isValid')
+    end
   end
 end

data/spec/unit/defaultfile_parser_spec.rb

@@ -38,5 +38,25 @@ module Defgen
         property.attributes.ownership.should eq(ownership)
       end
     end
+    
+    it "can handle a custom getter" do
+      property = nil
+      
+      expect do
+        property = defaultfile_parser.parse("bool 'valid', :getter => 'isValid'").first
+      end.to_not raise_error
+      
+      property.attributes.getter.should eq('isValid')
+    end
+    
+    it "can handle overriding ownership" do
+      property = nil
+      
+      expect do
+        property = defaultfile_parser.parse("array 'myCollection', :ownership => :weak").first
+      end.to_not raise_error
+      
+      property.attributes.ownership.should eq(:weak)
+    end
   end
 end

data/spec/unit/property/attributes_spec.rb

@@ -6,7 +6,9 @@ module Defgen
     describe Attributes do
       subject(:attributes) { Attributes.new }
       
+      it { should respond_to :property }
       it { should respond_to :ownership }
+      it { should respond_to :getter }
                         
       Attributes::VALID_OWNERSHIPS.each do |semantic|
         it "creates the predicate method #{semantic}?" do
@@ -43,6 +45,13 @@ module Defgen
           attributes.to_s.should eq('(nonatomic)')
         end
       end
+      
+      it "uses a custom getter" do
+        FakeProperty = Struct.new(:prefix)
+        attributes.property = FakeProperty.new('ps')
+        attributes.getter = 'isValid'
+        attributes.to_s.should eq('(nonatomic, strong, getter=ps_isValid)')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defgen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: