plastic_cup 0.0.2 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDNlZGZkMThkNzQwMmE0ZjU3OTU0M2RkNWI0NTljNGYzZDlkZGZiZg==
+    OGI3ODk4MmZmMmM2MzYzYTk5ZmJlOGJiYmQ4YmVlZDU4YjM4YTFmYg==
   data.tar.gz: !binary |-
-    NTNmMmI5M2QwZWM2NGY1YmZhNTU5YTNkZTFlMGY2OTJjZjlkMWVlZg==
+    NThhNDRiNWY5NzVmMTczZmZiOTZjMDVlMjNmZDc4YzhjMDQwYmFhZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmM3ZDhkNmQzNjczOWI4ZjcwZDdmMjM3Njg3MTUxNjBiN2IxMWU4ODA1Mzk0
-    YTgxMjk5M2MyNTlkMGNkM2YzNjZkOGQ0Y2VkY2Y1OGY3NmRjODA5MjZmYmVl
-    OGFkNjQ2YzY0YjVlZmE2ZWIwNTY5Zjc3ZWY1YzRjMWJkNWJjOWY=
+    YjVmN2ZjYjVlNDcyYzU0MGJhMmQ3NGY2YzAwYzA5N2RkMTliNjY3ZDNiOGJj
+    ZjVlOWYzNzQxNjhlOTUwODQ4MmE2ZDIyN2JjMWMwMzg5MTBiMTE1M2QzMTI1
+    YmFjODlmMmRmMjgyYjdiOGRjODQ0ZjU5OWE4OTg3NDQzNTYyMWQ=
   data.tar.gz: !binary |-
-    NmI5NTgxNWVhMTMwODNhNWNlMGJjYjlhZjQ1MDdmZDkyM2I3YTVlMmVjZWZm
-    ZTgzMzFiNGZlM2RkZDY1N2Y5MzYyM2Y2M2VmMzEwOWNiZWFkYWJlMTY4NThi
-    NTcyY2RmZjEwNzVhZDE0MTU0ZjExODZlMjUzYTBhYzdiN2E3NDA=
+    MDcwYWQ4NzczZTIxZmVmZWJhM2U0ZjdlZDhhODRiZjllMmJlODE2ZWJmZTkx
+    NmMzNDg2MWMxZWNjOGY5MTlkMzM0MDdiNjZiOGRlZDU2YzZhMzdiMGY0NTY3
+    N2Q2Y2FhMGE1MTBkNzNmYmYwNjQzMGJlMjFjYjYxNTk3MWQ4MmU=

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 group :test, :development do
   gem 'rake'
+  gem 'motion-stump'
 end
 
 gemspec

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    plastic_cup (0.0.2)
+    plastic_cup (0.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    motion-stump (0.3.0)
     rake (10.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  motion-stump
   plastic_cup!
   rake

data/README.md

@@ -33,6 +33,19 @@ PlasticCup::Base.add_style_sheet(:green_button, {
 @button = PlasticCup::Base.style(UIButton.new, :green_button)
 ```
 
+Support different iOS versions
+```ruby
+PlasticCup::Base.add_style_sheet(:bg_view, {
+  frame: CGRectMake(0, 0, 320, 200)
+}, :all)
+
+PlasticCup::Base.add_style_sheet(:bg_view, {
+  frame: CGRectMake(0, 20, 320, 200)
+}, :ios7)
+# supported symbols: :all, :ios4, :ios5, :ios6, :ios7
+# default is :all
+```
+
 If you define stylesheet outside methods, some values (e.g. UIFont) need to be in Proc form:
 ```ruby
 PlasticCup::Base.add_style_sheet(:login_title, {

data/Rakefile

@@ -8,6 +8,7 @@ else
 end
 require 'bundler'
 Bundler.require
+require 'motion-stump'
 
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.

data/lib/plastic_cup/base.rb

@@ -2,6 +2,8 @@ module PlasticCup
 
   class Base
 
+    OSVersions = %w(all ios4 ios5 ios6 ios7)
+
     def self.style(target, style)
       if style.is_a?(Hash)
         apply_properties(target, style)
@@ -20,12 +22,21 @@ module PlasticCup
       target
     end
 
-    def self.add_style_sheet(name, properties)
-      styles[to_key(name)] = Stylesheet.new(properties)
+    def self.add_style_sheet(name, properties, os_version=:all)
+      if OSVersions.include?(os_version.to_s)
+        styles[to_key(name)] ||= {}
+        styles[to_key(name)][os_version.to_sym] = Stylesheet.new(properties)
+      else
+        raise ArgumentError.new "OS version only accept #{OSVersions}"
+      end
     end
 
     def self.get_style_sheet(style)
-      style_hash = styles[to_key(style)]
+      version_string = UIDevice.currentDevice.systemVersion.split('.').first
+      if styles[to_key(style)].is_a?(Hash)
+        style_hash = styles[to_key(style)]["ios#{version_string}".to_sym]
+        style_hash ||= styles[to_key(style)][:all]
+      end
       NSLog "WARNING: Style #{style} undefined." if style_hash.nil?
       style_hash
     end

data/lib/plastic_cup/version.rb

@@ -1,3 +1,3 @@
 module PlasticCup
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/spec/base_spec.rb

@@ -87,6 +87,39 @@ describe 'PlasticCup::Base' do
       style_sheet.properties.should == {text: 'My Text', textAlignment: 1}
       style_sheet.extends.should == [:mother, :father]
     end
+
+    describe 'os version' do
+      after do
+        UIDevice.currentDevice.reset(:systemVersion)
+      end
+
+      it 'should add style sheet with specific os version' do
+        PlasticCup::Base.add_style_sheet(:my_style, {text: 'iOS 7 text'}, :ios7)
+        PlasticCup::Base.add_style_sheet(:my_style, {text: 'iOS 6 text'}, :ios6)
+        PlasticCup::Base.add_style_sheet(:my_style, {text: 'other iOS text'})
+
+        UIDevice.currentDevice.stub!(:systemVersion, return: '6.1')
+        style_sheet = PlasticCup::Base.get_style_sheet(:my_style)
+        style_sheet.properties.should == {text: 'iOS 6 text'}
+
+        UIDevice.currentDevice.stub!(:systemVersion, return: '7.0')
+        style_sheet = PlasticCup::Base.get_style_sheet(:my_style)
+        style_sheet.properties.should == {text: 'iOS 7 text'}
+
+        UIDevice.currentDevice.stub!(:systemVersion, return: '5.0')
+        style_sheet = PlasticCup::Base.get_style_sheet(:my_style)
+        style_sheet.properties.should == {text: 'other iOS text'}
+
+      end
+
+      it 'add style sheet should raise error if os version not supported' do
+        lambda {
+          PlasticCup::Base.add_style_sheet(:my_style, {text: ''}, :ios1)
+        }.
+            should.raise(ArgumentError).
+            message.should.match(/OS version only accept /)
+      end
+    end
   end
 
   describe '#handler' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plastic_cup
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - April Tsang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Plastic Cup is a simplified version of Teacup, aiming at memory leak
   prevention.