xdry 0.1.0

data/site/master.css

@@ -0,0 +1,94 @@
+/* @override file:///Users/andreyvit/Dropbox/projects/active/xdry/site/_site/master.css */
+
+* { margin: 0px; padding: 0px; }
+
+#container { margin: 0 auto; width: 900px; }
+
+body { margin: 50px 20px; font: 16px 'PT Serif', arial, sans-serif; line-height: 24px; background: #fff; color: #222; }
+
+h1, h2 { font-family: 'Pacifico', arial, sans-serif; color: #333; }
+h1 { font-size: 40px; margin: 0px 0px 40px; line-height: 56px; }
+h2 { font-size: 24px; margin: 30px 0px 0px; line-height: 42px; }
+
+p { margin: 10px 0px 0px; }
+
+ul { margin: 10px 0px; }
+li { list-style-position: inside; }
+
+pre { background: #f0f0ff; border: 1px solid #000; padding: 12px 20px; font: 14px Monaco, Menlo, monospace; line-height: 15px; }
+pre, .highlight { margin: 20px 0px; }
+.highlight pre { margin: 0px; }
+
+a { color: #222; }
+a:visited { color: #666; }
+a:hover { color: #000; }
+
+.example { }
+.example:after { content: ""; display: block; clear: both; }
+.example .highlight { float: left; width: 380px; margin-right: 10px; }
+.example .highlight + .highlight { width: 510px; margin-right: 0px; }
+.example .highlight:before { content: "Before"; font-size: 13px; line-height: 12px; }
+.example .highlight + .highlight:before { content: "After"; }
+.example pre { font-size: 12px; padding: 12px 10px; }
+ul + .example .highlight { margin-top: 0px; }
+
+.highlight  { background: #ffffff; }
+.highlight .c { color: #999988; font-style: italic } /* Comment */
+/* .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .k { font-weight: bold } /* Keyword */
+.highlight .o { font-weight: bold } /* Operator */
+.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
+.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #aa0000 } /* Generic.Error */
+.highlight .gh { color: #999999 } /* Generic.Heading */
+.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
+.highlight .go { color: #888888 } /* Generic.Output */
+.highlight .gp { color: #555555 } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #aaaaaa } /* Generic.Subheading */
+.highlight .gt { color: #aa0000 } /* Generic.Traceback */
+.highlight .kc { font-weight: bold } /* Keyword.Constant */
+.highlight .kd { font-weight: bold } /* Keyword.Declaration */
+.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #009999 } /* Literal.Number */
+.highlight .s { color: #d14 } /* Literal.String */
+.highlight .na { color: #008080 } /* Name.Attribute */
+.highlight .nb { color: #0086B3 } /* Name.Builtin */
+.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
+.highlight .no { color: #008080 } /* Name.Constant */
+.highlight .ni { color: #800080 } /* Name.Entity */
+.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nt { color: #000080 } /* Name.Tag */
+.highlight .nv { color: #008080 } /* Name.Variable */
+.highlight .ow { font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #009999 } /* Literal.Number.Float */
+.highlight .mh { color: #009999 } /* Literal.Number.Hex */
+.highlight .mi { color: #009999 } /* Literal.Number.Integer */
+.highlight .mo { color: #009999 } /* Literal.Number.Oct */
+.highlight .sb { color: #d14 } /* Literal.String.Backtick */
+.highlight .sc { color: #d14 } /* Literal.String.Char */
+.highlight .sd { color: #d14 } /* Literal.String.Doc */
+.highlight .s2 { color: #d14 } /* Literal.String.Double */
+.highlight .se { color: #d14 } /* Literal.String.Escape */
+.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
+.highlight .si { color: #d14 } /* Literal.String.Interpol */
+.highlight .sx { color: #d14 } /* Literal.String.Other */
+.highlight .sr { color: #009926 } /* Literal.String.Regex */
+.highlight .s1 { color: #d14 } /* Literal.String.Single */
+.highlight .ss { color: #990073 } /* Literal.String.Symbol */
+.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #008080 } /* Name.Variable.Class */
+.highlight .vg { color: #008080 } /* Name.Variable.Global */
+.highlight .vi { color: #008080 } /* Name.Variable.Instance */
+.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */

data/spec/boxing_spec.rb

@@ -0,0 +1,80 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "boxing support" do
+
+  def box expected
+    expected = remove_common_indent(expected)
+    unless expected.lines.first.strip =~ %r,^- \(id\)box:\(([^)]+)\)(\w+) \{$,
+      raise StandardError, "Invalid first line: #{expected.lines.first}"
+    end
+    type_string, var_name = $1.strip, $2.strip
+    type = XDry::VarType.parse(type_string)
+    raise "Invalid variable type '#{type_string}'" if type.nil?
+    boxer = XDry::Boxing.converter_for(type)
+    raise "No boxer available for variable type '#{type_string}'" if boxer.nil?
+    lines = XDry::Emitter.capture do |o|
+      o.block "- (id)box:(#{type.to_s})#{var_name}" do
+        o << "return " + boxer.box(o, var_name, "#{var_name}fix") + ";"
+      end
+    end
+    result = lines.join("\n").gsub("\t", "  ")
+    result.strip.should == expected.strip
+  end
+
+  it "should box NSString verbatim" do
+    box <<-END
+      - (id)box:(NSString *)foo {
+        return foo;
+      }
+    END
+  end
+
+  it "should box int via NSNumber" do
+    box <<-END
+      - (id)box:(int)foo {
+        return [NSNumber numberWithInt:foo];
+      }
+    END
+  end
+
+  it "should box NSInteger via NSNumber" do
+    box <<-END
+      - (id)box:(NSInteger)foo {
+        return [NSNumber numberWithInteger:foo];
+      }
+    END
+  end
+
+  it "should box float via NSNumber" do
+    box <<-END
+      - (id)box:(float)foo {
+        return [NSNumber numberWithFloat:foo];
+      }
+    END
+  end
+
+  it "should box double via NSNumber" do
+    box <<-END
+      - (id)box:(double)foo {
+        return [NSNumber numberWithDouble:foo];
+      }
+    END
+  end
+
+  it "should box NSTimeInterval as double via NSNumber" do
+    box <<-END
+      - (id)box:(NSTimeInterval)foo {
+        return [NSNumber numberWithDouble:foo];
+      }
+    END
+  end
+
+  it "should box CGFloat as float via NSNumber" do
+    box <<-END
+      - (id)box:(CGFloat)foo {
+        return [NSNumber numberWithFloat:foo];
+      }
+    END
+  end
+
+end

data/spec/ctor_from_field_spec.rb

@@ -0,0 +1,251 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "constructor from fields generator" do
+
+  it "should add a constructor for NSString *_something field marked with a full-line marker" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   !c
+        NSString *_something;
+      }
+
+    + - (id)initWithSomething:(NSString *)something;
+    +
+      @end
+
+      @implementation Foo
+    +
+    + - (id)initWithSomething:(NSString *)something {
+    +   if (self = [super init]) {
+    +     _something = [something copy];
+    +   }
+    +   return self;
+    + }
+
+      @end
+    END
+  end
+
+  it "should add a constructor for NSString *_something field marked with an inline marker" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   NSString *_something; !c
+    +   NSString *_something;
+      }
+
+    + - (id)initWithSomething:(NSString *)something;
+    +
+      @end
+
+      @implementation Foo
+    +
+    + - (id)initWithSomething:(NSString *)something {
+    +   if (self = [super init]) {
+    +     _something = [something copy];
+    +   }
+    +   return self;
+    + }
+
+      @end
+    END
+  end
+
+  it "should do nothing when a constructor already exists" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   NSString *_something; !c
+    +   NSString *_something;
+      }
+
+      - (id)initWithSomething:(NSString *)something;
+
+      @end
+
+      @implementation Foo
+
+      - (id)initWithSomething:(NSString *)something {
+        if (self = [super init]) {
+          _something = [something copy];
+        }
+        return self;
+      }
+
+      @end
+    END
+  end
+
+  it "should add a missing interface declaration when an implementation already exists" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   NSString *_something; !c
+    +   NSString *_something;
+      }
+    +
+    + - (id)initWithSomething:(NSString *)something;
+
+      @end
+
+      @implementation Foo
+
+      - (id)initWithSomething:(NSString *)something {
+        if (self = [super init]) {
+          _something = [something copy];
+        }
+        return self;
+      }
+
+      @end
+    END
+  end
+
+  it "should add a missing implementation when an interface declaration already exists" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   NSString *_something; !c
+    +   NSString *_something;
+      }
+
+      - (id)initWithSomething:(NSString *)something;
+
+      @end
+
+      @implementation Foo
+    +
+    + - (id)initWithSomething:(NSString *)something {
+    +   if (self = [super init]) {
+    +     _something = [something copy];
+    +   }
+    +   return self;
+    + }
+
+      @end
+    END
+  end
+
+  it "should use aSomething as arg name if a field is not prefixed" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   NSString *something; !c
+    +   NSString *something;
+      }
+
+    + - (id)initWithSomething:(NSString *)something;
+    +
+      @end
+
+      @implementation Foo
+    +
+    + - (id)initWithSomething:(NSString *)aSomething {
+    +   if (self = [super init]) {
+    +     something = [aSomething copy];
+    +   }
+    +   return self;
+    + }
+
+      @end
+    END
+  end
+
+  it "should use 'an' prefix if an unprefixed field name starts with a vowel" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   NSString *apple; !c
+    +   NSString *apple;
+      }
+
+    + - (id)initWithApple:(NSString *)apple;
+    +
+      @end
+
+      @implementation Foo
+    +
+    + - (id)initWithApple:(NSString *)anApple {
+    +   if (self = [super init]) {
+    +     apple = [anApple copy];
+    +   }
+    +   return self;
+    + }
+
+      @end
+    END
+  end
+
+  it "should add a missing assignment to an already defined implementation" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   NSString *something; !c
+    +   NSString *something;
+      }
+
+      - (id)initWithSomething:(NSString *)something;
+
+      @end
+
+      @implementation Foo
+
+      - (id)initWithSomething:(NSString *)aSomething {
+        if (self = [super init]) {
+    +     something = [aSomething copy];
+        }
+        return self;
+      }
+
+      @end
+    END
+  end
+
+  it "should use self->something if the arg name == field name in an already defined implementation" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   NSString *something; !c
+    +   NSString *something;
+      }
+
+      - (id)initWithSomething:(NSString *)something;
+
+      @end
+
+      @implementation Foo
+
+      - (id)initWithSomething:(NSString *)something {
+        if (self = [super init]) {
+    +     self->something = [something copy];
+        }
+        return self;
+      }
+
+      @end
+    END
+  end
+
+  it "should add a constructor for several fields" do
+    xdry :ctor_from_field, <<-END
+      @interface Foo {
+    -   NSString *_foo; !c
+    -   NSInteger _bar; !c
+    -   Boz *_boz; !c
+    +   NSString *_foo;
+    +   NSInteger _bar;
+    +   Boz *_boz;
+      }
+
+    + - (id)initWithFoo:(NSString *)foo bar:(NSInteger)bar boz:(Boz *)boz;
+    +
+      @end
+
+      @implementation Foo
+    +
+    + - (id)initWithFoo:(NSString *)foo bar:(NSInteger)bar boz:(Boz *)boz {
+    +   if (self = [super init]) {
+    +     _foo = [foo copy];
+    +     _bar = bar;
+    +     _boz = [boz retain];
+    +   }
+    +   return self;
+    + }
+
+      @end
+    END
+  end
+
+end

data/spec/dealloc_spec.rb

@@ -0,0 +1,103 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "dealloc support" do
+
+  it "should add missing release calls to dealloc" do
+    xdry :dealloc, <<-END
+      @interface Foo {
+        NSString *something;
+      }
+      @end
+
+      @implementation Foo
+
+      - (void)dealloc {
+    +   [something release], something = nil;
+        [super dealloc];
+      }
+
+      @end
+    END
+  end
+
+  it "shouldn't add release calls that already exist" do
+    xdry :dealloc, <<-END
+      @interface Foo {
+        NSString *something;
+        NSString *somethingElse;
+      }
+      @end
+
+      @implementation Foo
+
+      - (void)dealloc {
+        [something release];
+    +   [somethingElse release], somethingElse = nil;
+        [super dealloc];
+      }
+
+      @end
+    END
+  end
+
+  it "shouldn't add anything if all calls already exist" do
+    xdry :dealloc, <<-END
+      @interface Foo {
+        NSString *something;
+        NSString *somethingElse;
+      }
+      @end
+
+      @implementation Foo
+
+      - (void)dealloc {
+        [something release];
+        [somethingElse release], somethingElse = nil;
+        [super dealloc];
+      }
+
+      @end
+    END
+  end
+
+  it "should detect self.foo = nil as a release call" do
+    xdry :dealloc, <<-END
+      @interface Foo {
+        NSString *something;
+        NSString *somethingElse;
+      }
+      @end
+
+      @implementation Foo
+
+      - (void)dealloc {
+        self.something = nil;
+    +   [somethingElse release], somethingElse = nil;
+        [super dealloc];
+      }
+
+      @end
+    END
+  end
+
+  it "should add dealloc if it does not exist" do
+    xdry :dealloc, <<-END
+      @interface Foo {
+        NSString *something;
+        NSString *somethingElse;
+      }
+      @end
+
+      @implementation Foo
+    +
+    + - (void)dealloc {
+    +   [something release], something = nil;
+    +   [somethingElse release], somethingElse = nil;
+    +   [super dealloc];
+    + }
+    +
+      @end
+    END
+  end
+
+end