ProMotion 1.0.2 → 1.0.3

data/.travis.yml

@@ -1,6 +1,5 @@
 language: objective-c
 gemfile:
   - Gemfile
-before_script: bundle install
+before_script: sudo chown -R travis ~/Library/RubyMotion
 script: bundle exec rake spec
-bump: 5

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Jamon Holmgren
+Copyright (c) 2013 Jamon Holmgren
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/ProMotion.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |gem|
                         utilities to make iOS development more like Ruby and less like Objective-C.
                       "
   gem.homepage      = "https://github.com/clearsightstudio/ProMotion"
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/ProMotion/containers/tabs.rb

@@ -27,7 +27,7 @@ module ProMotion
     end
 
     def set_tab_bar_badge(number)
-      self.tab_bar_item[:badge] = number
+      self.tab_bar_item[:badge_number] = number
       refresh_tab_bar_item
     end
 

data/lib/ProMotion/table/cell/table_view_cell_module.rb

@@ -50,7 +50,11 @@ module ProMotion
 
     def set_subtitle
       if data_cell[:subtitle] && self.detailTextLabel
-        self.detailTextLabel.text = data_cell[:subtitle]
+        if data_cell[:subtitle].is_a? NSAttributedString
+          self.detailTextLabel.attributedText = data_cell[:subtitle]
+        else
+          self.detailTextLabel.text = data_cell[:subtitle]
+        end
         self.detailTextLabel.backgroundColor = UIColor.clearColor
         self.detailTextLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth
       end
@@ -135,7 +139,11 @@ module ProMotion
         cell_title = data_cell[:title]
         cell_title ||= ""
         self.textLabel.backgroundColor = UIColor.clearColor
-        self.textLabel.text = cell_title
+        if cell_title.is_a? NSAttributedString
+          self.textLabel.attributedText = cell_title
+        else
+          self.textLabel.text = cell_title
+        end
       end
 
       self

data/lib/ProMotion/table/data/table_data.rb

@@ -1,6 +1,6 @@
 module ProMotion
   class TableData
-    attr_accessor :data, :filtered_data, :filtered, :table_view
+    attr_accessor :data, :filtered_data, :search_string, :original_search_string, :filtered, :table_view
 
     def initialize(data, table_view)
       self.data = data
@@ -45,14 +45,15 @@ module ProMotion
       self.filtered_data = []
       self.filtered = true
 
-      search_string = search_string.downcase.strip
+      self.original_search_string = search_string
+      self.search_string = search_string.downcase.strip
 
       self.data.compact.each do |section|
         new_section = {}
         new_section[:cells] = []
 
         new_section[:cells] = section[:cells].map do |cell|
-          cell[:searchable] != false && "#{cell[:title]}\n#{cell[:search_text]}".downcase.strip.include?(search_string) ? cell : nil
+          cell[:searchable] != false && "#{cell[:title]}\n#{cell[:search_text]}".downcase.strip.include?(self.search_string) ? cell : nil
         end.compact
 
         if new_section[:cells] && new_section[:cells].length > 0
@@ -67,6 +68,8 @@ module ProMotion
     def stop_searching
       self.filtered_data = []
       self.filtered = false
+      self.search_string = false
+      self.original_search_string = false
     end
 
     def set_data_cell_defaults(data_cell)

data/lib/ProMotion/table/table.rb

@@ -31,6 +31,9 @@ module ProMotion
     end
 
     def set_up_table_view
+      # before access self.table_data, create UITableView and call on_load
+      table_view
+
       self.view = self.create_table_view_from_data(self.table_data)
     end
 
@@ -59,6 +62,14 @@ module ProMotion
       @promotion_table_data.filtered
     end
 
+    def original_search_string
+      @promotion_table_data.original_search_string
+    end
+
+    def search_string
+      @promotion_table_data.search_string
+    end
+
     def update_table_view_data(data)
       create_table_view_from_data(data) unless @promotion_table_data
       @promotion_table_data.data = data
@@ -242,9 +253,9 @@ module ProMotion
       PM.logger.warn "ProMotion expects you to use 'delete_cell(index_paths, animation)'' instead of 'deleteRowsAtIndexPaths(index_paths, withRowAnimation:animation)'."
       delete_row(index_paths, animation)
     end
-    
+
     protected
-    
+
     def map_row_animation_symbol(symbol)
       symbol ||= UITableViewRowAnimationAutomatic
       {
@@ -288,7 +299,7 @@ module ProMotion
       def get_refreshable_params
         @refreshable_params ||= nil
       end
-      
+
       # Indexable
       def indexable(params = {})
         @indexable_params = params

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "1.0.2" unless defined?(ProMotion::VERSION)
+  VERSION = "1.0.3" unless defined?(ProMotion::VERSION)
 end

data/lib/ProMotion/web/web_screen_module.rb

@@ -100,10 +100,11 @@ module ProMotion
     alias :reload :refresh
 
     def open_in_chrome(inRequest)
-      # Add pod 'OpenInChrome' to your Rakefile if you want links to open in chrom for users.
+      # Add pod 'OpenInChrome' to your Rakefile if you want links to open in Google Chrome for users.
+      # This will fall back to Safari if the user doesn't have Chrome installed.
       chrome_controller = OpenInChromeController.sharedInstance
       return open_in_safari(inRequest) unless chrome_controller.isChromeInstalled
-      chrome_controller.open_in_chrome(inRequest.URL)
+      chrome_controller.openInChrome(inRequest.URL)
     end
 
     def open_in_safari(inRequest)

data/spec/functional/func_searchable_table_spec.rb

@@ -29,4 +29,16 @@ describe "Searchable table spec" do
     @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 50
   end
 
+  it "should expose the search_string variable and clear it properly" do
+    @controller.searchDisplayController(@controller, shouldReloadTableForSearchString:"North")
+
+    @controller.search_string.should == "north"
+    @controller.original_search_string.should == "North"
+
+    @controller.searchDisplayControllerWillEndSearch(@controller)
+
+    @controller.search_string.should == false
+    @controller.original_search_string.should == false
+  end
+
 end

data/spec/unit/tables/table_view_cell_spec.rb

@@ -19,26 +19,43 @@ describe "PM::TableViewCellModule" do
     }
   end
 
+  def attributed_cell
+    {
+      title: NSMutableAttributedString.alloc.initWithString("Attributed Title"),
+      subtitle: NSMutableAttributedString.alloc.initWithString("Attributed Subtitle"),
+      cell_style: UITableViewCellStyleSubtitle
+    }
+  end
+
   before do
     @screen = TestTableScreen.new
     button = UIButton.buttonWithType(UIButtonTypeRoundedRect).tap{|b| b.titleLabel.text = "ACC" }
     @screen.mock! :table_data do
       [
-        { title: "", cells: [] },
-        { title: "", cells: [
-          {title: "Test 1", accessory_type: UITableViewCellStateShowingEditControlMask },
-          custom_cell,
-          { title: "Test2", accessory: { view: button } } ] }
+        {
+          title: "", cells: []
+        },
+        {
+          title: "",
+          cells: [
+            { title: "Test 1", accessory_type: UITableViewCellStateShowingEditControlMask },
+            custom_cell,
+            { title: "Test2", accessory: { view: button } },
+            attributed_cell
+          ]
+        }
       ]
     end
 
     @screen.on_load
 
     @custom_ip = NSIndexPath.indexPathForRow(1, inSection: 1) # Cell "Crazy Full Featured Cell"
+    @attributed_ip = NSIndexPath.indexPathForRow(3, inSection: 1) # Attributed Cell
 
     @screen.update_table_data
 
     @subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: @custom_ip)
+    @attributed_subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: @attributed_ip)
   end
 
   it "should be a PM::TableViewCell" do
@@ -49,6 +66,14 @@ describe "PM::TableViewCellModule" do
     @subject.textLabel.text.should == "Crazy Full Featured Cell"
   end
 
+  it "should allow attributed title" do
+    @attributed_subject.textLabel.attributedText.mutableString.should == "Attributed Title"
+  end
+
+  it "should allow attributed subtitle" do
+    @attributed_subject.detailTextLabel.attributedText.mutableString.should == "Attributed Subtitle"
+  end
+
   it "should have the right subtitle" do
     @subject.detailTextLabel.text.should == "This is way too huge..."
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webstub
@@ -197,7 +197,8 @@ files:
 - spec/unit/view_helper_spec.rb
 - spec/unit/web_spec.rb
 homepage: https://github.com/clearsightstudio/ProMotion
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: