xdry 0.1.0

data/spec/dictionary_coding_spec.rb

@@ -0,0 +1,132 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "dictionary coding generator" do
+
+  it "should implement dictionary coding" do
+    xdry :dict_coding, <<-END
+      @interface Foo {
+        // persistent
+        NSString *_something;
+      }
+
+      - (id)initWithDictionary:(NSDictionary *)dictionary;
+
+      @property(nonatomic, retain) NSString *something;
+
+      @end
+
+      // start impl
+
+    + #define SomethingKey @"Something"
+    +
+      @implementation Foo
+
+    + - (id)initWithDictionary:(NSDictionary *)dictionary {
+    +   if (self = [super init]) {
+    +     id somethingRaw = [dictionary objectForKey:SomethingKey];
+    +     if (somethingRaw != nil) {
+    +       _something = [somethingRaw copy];
+    +     }
+    +   }
+    +   return self;
+    + }
+    +
+    + - (NSDictionary *)dictionaryRepresentation {
+    +   NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+    +   [dictionary setObject:_something forKey:SomethingKey];
+    +   return dictionary;
+    + }
+    +
+      @end
+    END
+  end
+
+  it "should reuse existing initWithDictionary: and dictionaryRepresentation methods" do
+    xdry :dict_coding, <<-END
+      @interface Foo {
+        // persistent
+        NSString *_something;
+      }
+
+      - (id)initWithDictionary:(NSDictionary *)dict;
+
+      @property(nonatomic, retain) NSString *something;
+
+      @end
+
+      // start impl
+
+    + #define SomethingKey @"Something"
+    +
+      @implementation Foo
+
+      - (id)initWithDictionary:(NSDictionary *)dict {
+        if (self = [super init]) {
+    +     id somethingRaw = [dict objectForKey:SomethingKey];
+    +     if (somethingRaw != nil) {
+    +       _something = [somethingRaw copy];
+    +     }
+        }
+        return self;
+      }
+
+      - (NSDictionary *)dictionaryRepresentation {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];"
+    +   [dictionary setObject:_something forKey:SomethingKey];
+        return dictionary;
+      }
+
+      @end
+    END
+  end
+
+  it "should only add missing persistence code" do
+    xdry :dict_coding, <<-END
+      @interface Foo {
+        // persistent
+        NSString *_something;
+        NSString *_another;
+      }
+
+      - (id)initWithDictionary:(NSDictionary *)dict;
+
+      @property(nonatomic, retain) NSString *something;
+
+      @end
+
+      // start impl
+
+      // persistence keys
+      #define SomethingKey @"Something"
+    + #define AnotherKey @"Another"
+
+      // other stuff
+
+      @implementation Foo
+
+      - (id)initWithDictionary:(NSDictionary *)dict {
+        if (self = [super init]) {
+          id somethingRaw = [dict objectForKey:SomethingKey];
+          if (somethingRaw != nil) {
+            _something = [somethingRaw copy];
+          }
+    +     id anotherRaw = [dict objectForKey:AnotherKey];
+    +     if (anotherRaw != nil) {
+    +       _another = [anotherRaw copy];
+    +     }
+        }
+        return self;
+      }
+
+      - (NSDictionary *)dictionaryRepresentation {
+        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];"
+        [dictionary setObject:_something forKey:SomethingKey];
+    +   [dictionary setObject:_another forKey:AnotherKey];
+        return dictionary;
+      }
+
+      @end
+    END
+  end
+
+end

data/spec/field_from_prop_spec.rb

@@ -0,0 +1,72 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "field from property generator" do
+
+  it "should add missing fields for declared properties" do
+    xdry :field_from_prop, <<-END
+      @interface Foo {
+    +   NSString *_something;
+      }
+
+      @property(nonatomic, retain) NSString *something;
+
+      @end
+
+      @implementation Foo
+
+      @end
+    END
+  end
+
+  it "shouldn't add fields that already exist" do
+    xdry :field_from_prop, <<-END
+      @interface Foo {
+        NSString *something;
+      }
+
+      @property(nonatomic, retain) NSString *something;
+
+      @end
+
+      @implementation Foo
+
+      @end
+    END
+  end
+
+  it "shouldn't add fields that already exist, even if they are prefixed" do
+    xdry :field_from_prop, <<-END
+      @interface Foo {
+        NSString *_something;
+      }
+
+      @property(nonatomic, retain) NSString *something;
+
+      @end
+
+      @implementation Foo
+
+      @end
+    END
+  end
+
+  it "shouldn't add a field if a getter exists" do
+    xdry :field_from_prop, <<-END
+      @interface Foo {
+      }
+
+      @property(nonatomic, retain) NSString *something;
+
+      @end
+
+      @implementation Foo
+
+      - (NSString *)something {
+        return @"foo";
+      }
+
+      @end
+    END
+  end
+
+end

data/spec/prop_from_field_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "property from field generator" do
+
+  it "should add property for a field marked with a full-line marker" do
+    xdry :prop_from_field, <<-END
+      @interface Foo {
+    -   !p
+        NSString *_something;
+      }
+
+    + @property(nonatomic, retain) NSString *something;
+    +
+      @end
+
+      @implementation Foo
+
+      @end
+    END
+  end
+
+  it "should add property for a field marked with an inline marker" do
+    xdry :prop_from_field, <<-END
+      @interface Foo {
+    -   NSString *_something; !p
+    +   NSString *_something;
+      }
+
+    + @property(nonatomic, retain) NSString *something;
+    +
+      @end
+
+      @implementation Foo
+
+      @end
+    END
+  end
+
+end

data/spec/readme_samples_spec.rb

@@ -0,0 +1,76 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Properties Support" do
+
+  it "should add @property" do
+    xdry <<-END
+      @interface Foo {
+    -   Bar *value; !p
+    +   Bar *value;
+      }
+
+    + @property(nonatomic, retain) Bar *value;
+    +
+      @end
+
+      @implementation Foo
+    +
+    + @synthesize value;
+    +
+    + - (void)dealloc {
+    +   [value release], value = nil;
+    +   [super dealloc];
+    + }
+    +
+      @end
+    END
+  end
+
+  it "should add @property" do
+    xdry <<-END
+      @interface Foo {
+        // persistent
+        NSArray *_bars; // of Bar
+      }
+      @end
+
+    + #define BarsKey @"Bars"
+    +
+      @implementation Foo
+    +
+    + - (id)initWithDictionary:(NSDictionary *)dictionary {
+    +   if (self = [super init]) {
+    +     id barsRaw = [dictionary objectForKey:BarsKey];
+    +     if (barsRaw != nil) {
+    +       NSMutableArray *barsArray = [[NSMutableArray alloc] init];
+    +       for (NSDictionary *barsItemDictionary in (NSArray *) barsRaw) {
+    +         Bar *barsItem = [[Bar alloc] initWithDictionary:barsItemDictionary];
+    +         [barsArray addObject:barsItem];
+    +         [barsItem release];
+    +       }
+    +       _bars = barsArray;
+    +     }
+    +   }
+    +   return self;
+    + }
+    +
+    + - (NSDictionary *)dictionaryRepresentation {
+    +   NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+    +   NSMutableArray *barsArray = [NSMutableArray array];
+    +   for (Bar *barsItem in _bars) {
+    +     [barsArray addObject:[barsItem dictionaryRepresentation]];
+    +   }
+    +   [dictionary setObject:barsArray forKey:BarsKey];
+    +   return dictionary;
+    + }
+    +
+    + - (void)dealloc {
+    +   [_bars release], _bars = nil;
+    +   [super dealloc];
+    + }
+    +
+      @end
+    END
+  end
+
+end

data/spec/spec.opts

@@ -0,0 +1,3 @@
+--color
+--diff unified
+--backtrace

data/spec/spec_helper.rb

@@ -0,0 +1,53 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'xdry'
+require 'rspec'
+require 'rspec/autorun'
+
+def remove_common_indent content
+  first_line_indent = content.split("\n", 2).first.gsub(/\S.*$/, '')
+  content.gsub(/^#{first_line_indent}/, '')
+end
+
+def xdry gens, content=nil
+  if content.nil?
+    content = gens
+    gens = nil
+  end
+
+  config = XDry::Config.new
+  config.verbose = ((ENV['VERBOSE'] || '0').to_i != 0)
+
+  unless gens.nil?
+    gens = [gens] if gens.is_a?(Symbol)
+    config.enable_only = gens.collect { |g| g.to_s.gsub('_', '-') }
+  end
+
+  first_line_indent = content.split("\n", 2).first.gsub(/\S.*$/, '')
+  deleted_indent    = first_line_indent.sub(/\s\s$/, '-( |$)')
+  added_indent      = first_line_indent.sub(/\s\s$/, "\\\\+( |$)")
+
+  orig_content = content.lines.select { |l| l =~ /^(#{first_line_indent}|#{deleted_indent})|^$/ }.join("")
+  new_content  = content.lines.select { |l| l =~ /^(#{first_line_indent}|#{added_indent})|^$/ }.join("")
+
+  orig_content = orig_content.gsub(/^(#{first_line_indent}|#{deleted_indent})/, '')
+  new_content  = new_content.gsub(/^(#{first_line_indent}|#{added_indent})/, '')
+
+  if config.verbose
+    puts "-" * 40
+    puts orig_content
+    puts "-" * 40
+    puts new_content
+    puts "-" * 40
+  end
+
+  result = XDry.test_run({'main.m' => orig_content}, config)['main.m']
+  result = orig_content if result.nil?
+  result = result.gsub("\t", "  ")  # tests use 2 spaces for indentation
+
+  result.should == new_content
+end
+
+RSpec.configure do |config|
+
+end

data/spec/synthesize_spec.rb

@@ -0,0 +1,94 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "@synthesize support" do
+
+  it "should handle empty input" do
+    xdry :synth, "  "
+  end
+
+  it "should add @synthesize when a @property exists" do
+    xdry :synth, <<-END
+      @interface Foo {
+        BOOL value;
+      }
+      @property BOOL value;
+      @end
+
+      @implementation Foo
+    +
+    + @synthesize value;
+    +
+      @end
+    END
+  end
+
+  it "should reuse existing whitespace when inserting the first @synthesize" do
+    xdry :synth, <<-END
+      @interface Foo {
+        BOOL value;
+      }
+      @property BOOL value;
+      @end
+
+      @implementation Foo
+    +
+    + @synthesize value;
+
+      @end
+    END
+  end
+
+  it "should add @synthesize after existing @synthesize if any" do
+    xdry :synth, <<-END
+      @interface Foo {
+        BOOL value;
+      }
+      @property BOOL value;
+      @end
+
+      @implementation Foo
+
+      @synthesize something;
+      @synthesize something_else;
+    + @synthesize value;
+
+      @end
+    END
+  end
+
+  it "should use field name in @synthesize if needed" do
+    xdry :synth, <<-END
+      @interface Foo {
+        BOOL _value;
+      }
+      @property BOOL value;
+      @end
+
+      @implementation Foo
+
+      @synthesize something;
+    + @synthesize value=_value;
+
+      @end
+    END
+  end
+
+  it "shouldn't add @synthesize if a getter is already implemented" do
+    xdry :synth, <<-END
+      @interface Foo {
+        BOOL _value;
+      }
+      @property BOOL value;
+      @end
+
+      @implementation Foo
+
+      - (BOOL) value {
+        return _value;
+      }
+
+      @end
+    END
+  end
+
+end