easy-button 0.0.4 → 0.0.5

data/README.md

@@ -29,7 +29,7 @@ Gemfile
 ```ruby
 source :rubygems
 
-gem 'easy-button', :git => 'git://github.com/brianpattison/easy-button.git'
+gem 'easy-button'
 ```
 
 Run `bundle install`.

data/easy-button.gemspec

@@ -8,5 +8,5 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($\)
   gem.name          = "easy-button"
   gem.require_paths = ["lib"]
-  gem.version       = '0.0.4'
+  gem.version       = '0.0.5'
 end

data/lib/easy-button/easy-button.rb

@@ -1,5 +1,7 @@
 class EasyButton < UIButton
+  attr_writer :backgroundColor
   attr_accessor :borderRadius, :font, :textColor, :title
+  attr_reader :titleLabel
   
   def initWithFrame(frame)
     if super
@@ -16,14 +18,21 @@ class EasyButton < UIButton
   end
   
   def buttonSetup
+    # Custom Title Label
+    self.setTitleColor(UIColor.clearColor, forState:UIControlStateNormal)
+    @titleLabel = UILabel.alloc.initWithFrame(self.bounds)
+    @titleLabel.backgroundColor = UIColor.clearColor
+    @titleLabel.shadowColor = UIColor.colorWithWhite(0, alpha:0.5);
+    @titleLabel.shadowOffset = [0, -1]
+    @titleLabel.textAlignment = UITextAlignmentCenter
+    self.addSubview(@titleLabel)
+    
     self.opaque = false
     self.backgroundColor = UIColor.clearColor
     self.backgroundColor = "#ff0000"
     self.borderRadius = 10
     self.font = UIFont.boldSystemFontOfSize(18)
     self.textColor = '#fff'
-    titleLabel.shadowColor = UIColor.colorWithWhite(0, alpha:0.5);
-    titleLabel.shadowOffset = [0, -1]
   end
   
   def backgroundColor=(value)
@@ -41,31 +50,37 @@ class EasyButton < UIButton
       @backgroundColorBottom = value
     end
     self.setNeedsDisplay
+    self
   end
   
   def borderRadius=(value)
     @borderRadius = value
     self.setNeedsDisplay
+    self
+  end
+  
+  def font=(value)
+    @font = value
+    @titleLabel.setFont(@font)
+    self
   end
   
   def textColor=(value)
     @textColor = value
     if value.is_a? String
       red, green, blue = rgbFromHex(value)
-      titleLabel.textColor = UIColor.colorWithRed(red, green:green, blue:blue, alpha:1)
+      @titleLabel.textColor = UIColor.colorWithRed(red, green:green, blue:blue, alpha:1)
     else
-      titleLabel.textColor = value
+      @titleLabel.textColor = value
     end
-  end
-  
-  def font=(value)
-    @font = value
-    titleLabel.setFont(@font)
+    self
   end
   
   def title=(value)
     @title = value
-    self.setTitle(@title, forState:UIControlStateNormal)
+    @titleLabel.text = @title
+    self.setTitle(@title, forState:UIControlStateNormal) # For Accessibility
+    self
   end
   
   def drawRect(rect)
@@ -129,9 +144,9 @@ class EasyButton < UIButton
     CGContextRestoreGState(context)
     
     # Move Title Label Down When Pressed
+    @titleLabel.transform = CGAffineTransformIdentity
     if self.state == UIControlStateHighlighted
-      titleLabel.transform = CGAffineTransformIdentity
-      titleLabel.transform = CGAffineTransformMakeTranslation(0, 1)
+      @titleLabel.transform = CGAffineTransformMakeTranslation(0, 1)
     end
   end
   

data/spec/easy_button_spec.rb

@@ -3,10 +3,6 @@ describe EasyButton do
     @easyButton = EasyButton.alloc.initWithFrame([[0.0, 0.0], [10.0, 50.0]])
   end
 
-  it "backgroundColor should be transparent" do
-    @easyButton.backgroundColor.should.equal UIColor.clearColor
-  end
-  
   it "borderRadius should have a default value" do
     @easyButton.borderRadius.should.equal 10
   end
@@ -44,4 +40,8 @@ describe EasyButton do
     @easyButton.textColor = textColor
     @easyButton.titleLabel.textColor.should.equal UIColor.colorWithRed(0, green:0, blue:0, alpha:1)
   end
+  
+  it "should raise an error for bad textColor hex code" do
+    lambda { @easyButton.textColor = '#ff00' }.should.raise(ArgumentError, 'Argument is not a valid hex code.')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-button
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies: []
 description: A nice looking button in RubyMotion
 email:
@@ -43,8 +43,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Extends to UIButton class and adds properties for easy styling.
 test_files: []
+has_rdoc: