motion-prime 0.8.1 → 0.8.2

data/motion-prime/sections/table/table_delegate.rb

@@ -20,25 +20,25 @@ module MotionPrime
     end
 
     def numberOfSectionsInTableView(table)
-      table_section.number_of_sections(table)
+      table_section.number_of_groups(table)
     end
 
     def tableView(table, cellForRowAtIndexPath: index)
-      curCallTime = Time.now.to_f
-      curCallOffset = table.contentOffset.y
-      if @prevCallTime
-        timeDelta = curCallTime - @prevCallTime
-        offsetDelta = curCallOffset - @prevCallOffset
-        @deceleration_speed = offsetDelta/timeDelta
+      cur_call_time = Time.now.to_f
+      cur_call_offset = table.contentOffset.y
+      if @prev_call_time
+        time_delta = cur_call_time - @prev_call_time
+        offset_delta = cur_call_offset - @prev_call_offset
+        @deceleration_speed = offset_delta/time_delta
       end
-      @prevCallTime = curCallTime
-      @prevCallOffset = curCallOffset
+      @prev_call_time = cur_call_time
+      @prev_call_offset = cur_call_offset
 
       table_section.cell_for_index(table, index)
     end
 
-    def tableView(table, numberOfRowsInSection: section)
-      table_section.rows_for_section(section).try(:count).to_i
+    def tableView(table, numberOfRowsInSection: group)
+      table_section.cell_sections_for_group(group).try(:count).to_i
     end
 
     def tableView(table, heightForRowAtIndexPath: index)
@@ -49,12 +49,12 @@ module MotionPrime
       table_section.on_click(table, index)
     end
 
-    def tableView(table, viewForHeaderInSection: section)
-      table_section.view_for_header_in_section(table, section)
+    def tableView(table, viewForHeaderInSection: group)
+      table_section.header_cell_in_group(table, group)
     end
 
-    def tableView(table, heightForHeaderInSection: section)
-      table_section.height_for_header_in_section(table, section)
+    def tableView(table, heightForHeaderInSection: group)
+      table_section.height_for_header_in_group(table, group)
     end
 
     def scrollViewDidScroll(scroll)

data/motion-prime/services/table_data_indexes.rb

@@ -14,6 +14,14 @@ class TableDataIndexes
     a.section > b.section || a.row > b.row ? 1 : -1
   end
 
+  def greater_than(a, b)
+    compare_indexes(a, b) > 0
+  end
+
+  def less_than(a, b)
+    compare_indexes(a, b) < 0
+  end
+
   def sum_index(a, rows, crop_to_edges = true)
     row = a.row + rows
     section = a.section
@@ -25,8 +33,10 @@ class TableDataIndexes
       section = a.section + direction
       edge_row = [[0, row].max, max_row].min
 
-      if section < 0 || section >= sections_count
-        return crop_to_edges ? NSIndexPath.indexPathForRow(edge_row, inSection: a.section) : false
+      max_section = sections_count - 1
+      if section < 0 || section > max_section
+        edge_section = [[section, 0].max, max_section].min
+        return crop_to_edges ? NSIndexPath.indexPathForRow(edge_row, inSection: edge_section) : false
       end
 
       start_row = edge_row.zero? ? count_in_section(section) - 1 : 0

data/motion-prime/styles/base.rb

@@ -11,7 +11,7 @@ MotionPrime::Styles.define :base do
     left: 0,
     width: 320,
     bottom: 0,
-    separatorInset: 0
+    separator_inset: 0
 
   style :table_cell,
     background_color: :clear

data/motion-prime/styles/form.rb

@@ -1,7 +1,7 @@
 motion_require '../views/styles.rb'
 MotionPrime::Styles.define :base_form do
   style :header, container: {height: 25}
-  style :header_label,
+  style :header_label, mixins: [:multiline],
     left: 0,
     bottom: 5,
     top: nil,
@@ -13,7 +13,7 @@ MotionPrime::Styles.define :base_form do
     top: nil,
     width: 320
 
-  style :field,
+  style :field, :cell,
     selection_style: :none,
     background_color: :clear
 
@@ -95,10 +95,10 @@ MotionPrime::Styles.define :base_form do
   style :with_sections_field_switch,
     right: 20
 
-  style :with_sections_field_text_field, 
-    :with_sections_field_text_view, 
-    :with_sections_field_password_field, 
-    :with_sections_field_label, 
+  style :with_sections_field_text_field,
+    :with_sections_field_text_view,
+    :with_sections_field_password_field,
+    :with_sections_field_label,
     :with_sections_field_button,
     left: 20,
     right: 20

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/motion-prime/views/layout.rb

@@ -5,8 +5,11 @@ module MotionPrime
   module Layout
     def add_view(klass, options = {}, &block)
       options = options.clone
+      render_target = options.delete(:render_target)
+      parent_view = options.delete(:parent_view) || render_target
+
       bounds = if view_stack.empty?
-        options.delete(:parent_view).try(:bounds) || CGRectZero
+        parent_view.try(:bounds) || CGRectZero
       else
         view_stack.last.bounds
       end
@@ -15,7 +18,7 @@ module MotionPrime
       view = builder.view
       insert_index = options.delete(:at_index)
 
-      if render_target = options.delete(:render_target)
+      if render_target
         options[:bounds] = render_target.bounds
         insert_index ? render_target.insertSubview(view, atIndex: insert_index) : render_target.addSubview(view)
       elsif view_stack.any?

data/motion-prime/views/view_styler.rb

@@ -140,6 +140,8 @@ module MotionPrime
         view.layer.insertSublayer(gradient, atIndex: 0)
       elsif key == 'selection_style' && view.is_a?(UITableViewCell) && value.is_a?(Symbol)
         view.setSelectionStyle value.uitablecellselectionstyle
+      elsif key == 'estimated_cell_height' && view.is_a?(UITableView)
+        view.setEstimatedRowHeight value
       elsif key == 'separator_inset' && (view.is_a?(UITableViewCell) || view.is_a?(UITableView))
         if value.to_s == 'none'
           view.separatorInset = UIEdgeInsetsMake(0, 320, 0, 0)

data/spec/models/association_collection_spec.rb

@@ -37,21 +37,43 @@ describe "Prime::AssociationCollection" do
   describe "#all" do
     before do
       @organization = Organization.new
-      puts "count 1: #{@organization.projects.count}"
       project = Project.new(title: 'test 1')
       @organization.projects.add(project)
-      puts "count 2: #{@organization.projects.count}"
       project = Project.new(title: 'test 2')
       @organization.projects.add(project)
-      puts "count 3: #{@organization.projects.count}"
     end
 
-    it "should return all records by default" do
+    it "should return all records" do
       @organization.projects.all.count.should == 2
     end
+  end
+
+  describe "#find" do
+    before do
+      @organization = Organization.new
+      project = Project.create(title: 'test 1')
+      @organization.projects.add(project)
+      project = Project.create(title: 'test 2')
+      @organization.projects.add(project)
+      @organization.save
+    end
+
+    it "should return saved records by first hash" do
+      @organization.projects.find(title: 'test 1').count.should == 1
+    end
+  end
+
+  describe "#filter" do
+    before do
+      @organization = Organization.new
+      project = Project.new(title: 'test 1')
+      @organization.projects.add(project)
+      project = Project.new(title: 'test 2')
+      @organization.projects.add(project)
+    end
 
-    it "should return filter records by first hash" do
-      @organization.projects.all(title: 'test 1').count.should == 1
+    it "should return saved records by first hash" do
+      @organization.projects.filter(title: 'test 1').count.should == 1
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -281,6 +281,7 @@ files:
 - motion-prime/models/_association_mixin.rb
 - motion-prime/models/_base_mixin.rb
 - motion-prime/models/_dirty_mixin.rb
+- motion-prime/models/_filter_mixin.rb
 - motion-prime/models/_finder_mixin.rb
 - motion-prime/models/_nano_bag_mixin.rb
 - motion-prime/models/_sync_mixin.rb
@@ -301,6 +302,8 @@ files:
 - motion-prime/screens/extensions/_navigation_bar_mixin.rb
 - motion-prime/screens/screen.rb
 - motion-prime/sections/__section_with_container_mixin.rb
+- motion-prime/sections/_async_form_mixin.rb
+- motion-prime/sections/_async_table_mixin.rb
 - motion-prime/sections/_cell_section_mixin.rb
 - motion-prime/sections/_delegate_mixin.rb
 - motion-prime/sections/_draw_section_mixin.rb
@@ -312,6 +315,7 @@ files:
 - motion-prime/sections/form/form_delegate.rb
 - motion-prime/sections/form/password_field_section.rb
 - motion-prime/sections/form/select_field_section.rb
+- motion-prime/sections/form/static_field_section.rb
 - motion-prime/sections/form/string_field_section.rb
 - motion-prime/sections/form/submit_field_section.rb
 - motion-prime/sections/form/switch_field_section.rb