motion-prime 0.9.6 → 0.9.7

data/spec/factories/scaffold/sections/tasks/form.rb

@@ -0,0 +1,31 @@
+class TasksFormSection < Prime::FormSection
+  field :title,
+    label: { text: 'Title' },
+    input: {
+      text: proc { model.title },
+      placeholder: "Enter title here"
+    }
+
+  field :delete, type: :submit,
+    button: {
+      title: "Delete",
+      background_color: :red
+    },
+    action: :on_delete,
+    if: proc { model.persisted? }
+
+  field :submit, type: :submit,
+    button: { title: "Save" },
+    action: :on_submit
+
+  def on_delete
+    model.delete
+    screen.close_screen(to_root: true)
+  end
+
+  def on_submit
+    model.assign_attributes(field_values)
+    model.save
+    screen.close_screen
+  end
+end

data/spec/factories/scaffold/sections/tasks/index_cell.rb

@@ -0,0 +1,4 @@
+class TasksIndexCellSection < Prime::Section
+  container height: 40
+  element :title, text: proc { model.title }
+end

data/spec/factories/scaffold/sections/tasks/index_table.rb

@@ -0,0 +1,12 @@
+class TasksIndexTableSection < Prime::TableSection
+  def table_data
+    Task.all.map do |model|
+      TasksIndexCellSection.new(model: model)
+    end
+  end
+
+  def on_click(table, index)
+    section = data[index.row]
+    screen.open_screen 'tasks#show', params: { model: section.model }
+  end
+end

data/spec/factories/scaffold/sections/tasks/show.rb

@@ -0,0 +1,3 @@
+class TasksShowSection < Prime::Section
+  element :title, text: proc { model.title }
+end

data/spec/factories/scaffold/styles/tasks.rb

@@ -0,0 +1,18 @@
+Prime::Styles.define :tasks do
+  style :index do
+    style :cell_title,
+      text_color: :app_base,
+      left: 20,
+      top: 10,
+      width: 280,
+      font: :app_base.uifont(16),
+      height: 20
+  end
+  style :show do
+    style :title,
+      top: 120,
+      left: 0,
+      right: 0,
+      text_alignment: :center
+  end
+end

data/spec/factories/sections.rb

@@ -0,0 +1,9 @@
+class SampleViewSection < Prime::Section
+  element :description, text: "Lorem Ipsum", as: :view
+end
+class SampleDrawSection < Prime::Section
+  element :description, text: "Lorem Ipsum", as: :draw
+end
+class SampleSection < Prime::Section
+  element :description, text: "Lorem Ipsum"
+end

data/spec/features/scaffold/index.rb

@@ -0,0 +1,14 @@
+describe "scaffold index" do
+  before do
+    5.times do |index|
+      Task.create(title: "Task #{index}")
+    end
+    App.delegate.open_screen 'tasks#index'
+    @controller = App.delegate.content_controller.childViewControllers.last
+  end
+  it "should render tasks list" do
+    wait 0.3 do
+      @controller.has_content?("Task 2").should.be.true
+    end
+  end
+end

data/spec/features/screens/open_screen.rb

@@ -2,7 +2,7 @@ describe "open screen" do
   describe "from app delegate with default options" do
     before do
       App.delegate.open_screen :sample
-      @controller = App.delegate.window.rootViewController
+      @controller = App.delegate.content_controller
     end
     it "should open with navigation by default" do
       @controller.is_a?(UINavigationController).should.be.true
@@ -25,6 +25,18 @@ describe "open screen" do
     end
   end
 
+  describe "from app delegate with action" do
+    before do
+      App.delegate.open_screen 'tasks#new'
+      @controller = App.delegate.content_controller.childViewControllers.last
+    end
+
+    it "should open screen with action" do
+      @controller.is_a?(TasksScreen).should.be.true
+      @controller.title.should == 'New Task'
+    end
+  end
+
   describe "from another screen with navigation: true" do
     before do
       @parent_screen = SampleScreen.new(navigation: true)
@@ -32,7 +44,7 @@ describe "open screen" do
 
       App.delegate.open_screen @parent_screen
       @parent_screen.open_screen @child_screen
-      @controller = App.delegate.window.rootViewController
+      @controller = App.delegate.content_controller
 
       # we should call it because will_appear will happen async
       @child_screen.will_appear

data/spec/helpers/has_content.rb

@@ -0,0 +1,25 @@
+class MotionPrime::BaseElement
+  def has_content?(content)
+    text = computed_options[:text] || computed_options[:title] || ''
+    !!text.match(content)
+  end
+end
+class MotionPrime::Section
+  def has_content?(content)
+    self.elements.values.any? do |element|
+      element.has_content?(content)
+    end
+  end
+end
+class MotionPrime::TableSection
+  def has_content?(content)
+    data.any? do |section|
+      section.has_content?(content)
+    end
+  end
+end
+class MotionPrime::Screen
+  def has_content?(content)
+    main_section.has_content?(content)
+  end
+end

data/spec/unit/models/dirty_spec.rb

@@ -15,7 +15,6 @@ describe MotionPrime::Model do
     end
 
     it "should be false after save" do
-      puts @user.changed_attributes
       @user.has_changed?.should.be.false
     end
 

data/spec/unit/models/model_spec.rb

@@ -50,6 +50,7 @@ describe MotionPrime::Model do
     end
 
     it "creates model when invalid parameter and validate_attribute_presence=false" do
+      Prime.logger.disabled = true
       user = User.new({
         name: "Eddie", 
         age: 12, 
@@ -57,6 +58,7 @@ describe MotionPrime::Model do
         gender: "m",
       })
       user.name.should == "Eddie"
+      Prime.logger.disabled = false
     end
   end
 

data/spec/unit/prime/logger.rb

@@ -0,0 +1,49 @@
+describe "Prime.env" do
+
+  before do 
+    @logger = Prime::Logger.new
+    @logger.stub!(:output) do |message|
+      message
+    end
+  end
+
+  it 'should work' do
+    @logger.log("Hello world").should == 'Hello world'
+  end
+
+  describe "error level" do
+    before { Prime::Logger.level = :error }
+
+    it 'should log errors' do
+      @logger.error("message").should == ["message"]
+    end
+
+    it 'should not log info' do
+      @logger.info("message").should == nil
+    end
+  end
+
+  describe "info level" do
+    before { Prime::Logger.level = :info }
+
+    it 'should log info' do
+      @logger.info("message").should == ["message"]
+    end
+
+    it 'should not log debug' do
+      @logger.debug("message").should == nil
+    end
+  end
+
+  describe "debug level" do
+    before { Prime::Logger.level = :debug }
+
+    it 'should log debug' do
+      @logger.debug("message").should == ["message"]
+    end
+
+    it 'should not log dealloc' do
+      @logger.dealloc_message("message", Prime::Section.new).should == nil
+    end
+  end
+end

data/spec/unit/sections/section_spec.rb

@@ -0,0 +1,59 @@
+describe MotionPrime::Section do
+
+  describe "general" do
+    before do
+      @section = SampleSection.new(screen: @screen)
+    end
+
+    describe "#name" do
+      it "should use class name by default" do
+        @section.name.should == 'sample'
+      end
+
+      it "should use given name" do
+        section = SampleSection.new(name: 'my_section')
+        section.name.should == 'my_section'
+      end
+    end
+  end
+
+  describe "base section" do
+    before do
+      @screen = BaseScreen.new
+      @section = SampleViewSection.new(screen: @screen)
+      @section.render
+    end
+
+    describe "#element" do
+      it "should return element by name" do
+        @section.element(:description).is_a?(MotionPrime::BaseElement).should.be.true
+      end
+    end
+
+    describe "#view" do
+      it "should return view by element name" do
+        @section.view(:description).is_a?(MPLabel).should.be.true
+      end
+    end
+  end
+
+  describe "draw section" do
+    before do
+      @screen = BaseScreen.new
+      @section = SampleDrawSection.new(screen: @screen)
+      @section.render
+    end
+
+    describe "#element" do
+      it "should return element by name" do
+        @section.element(:description).is_a?(MotionPrime::DrawElement).should.be.true
+      end
+    end
+
+    describe "#view" do
+      it "should return container view by element name" do
+        @section.view(:description).is_a?(MPViewWithSection).should.be.true
+      end
+    end
+  end
+end

data/travis.sh

@@ -6,4 +6,4 @@ sudo bundle install
 #sudo pod setup
 sudo bundle exec rake pod:install
 sudo bundle exec rake clean &&
-sudo bundle exec rake spec
+sudo bundle exec rake spec output=colorized

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -226,35 +226,6 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - bin/prime
-- doc/FAQ.md
-- doc/SECTION.md
-- doc/STYLE.md
-- doc/code/getting_started.rb
-- doc/code/models.rb
-- doc/code/screens.rb
-- doc/code/sections.rb
-- doc/code/tables.rb
-- doc/docs/docco.css
-- doc/docs/getting_started.html
-- doc/docs/index.html
-- doc/docs/models.html
-- doc/docs/public/fonts/aller-bold.eot
-- doc/docs/public/fonts/aller-bold.ttf
-- doc/docs/public/fonts/aller-bold.woff
-- doc/docs/public/fonts/aller-light.eot
-- doc/docs/public/fonts/aller-light.ttf
-- doc/docs/public/fonts/aller-light.woff
-- doc/docs/public/fonts/fleurons.eot
-- doc/docs/public/fonts/fleurons.ttf
-- doc/docs/public/fonts/fleurons.woff
-- doc/docs/public/fonts/novecento-bold.eot
-- doc/docs/public/fonts/novecento-bold.ttf
-- doc/docs/public/fonts/novecento-bold.woff
-- doc/docs/public/images/gray.png
-- doc/docs/public/stylesheets/normalize.css
-- doc/docs/screens.html
-- doc/docs/sections.html
-- doc/docs/tables.html
 - files/Gemfile
 - files/Rakefile
 - files/app/app_delegate.rb
@@ -290,6 +261,7 @@ files:
 - motion-prime/config/base.rb
 - motion-prime/config/config.rb
 - motion-prime/core_ext/kernel.rb
+- motion-prime/core_ext/nil_class.rb
 - motion-prime/core_ext/time.rb
 - motion-prime/delegate/_base_mixin.rb
 - motion-prime/delegate/_navigation_mixin.rb
@@ -382,6 +354,7 @@ files:
 - motion-prime/styles/form.rb
 - motion-prime/support/_key_value_store.rb
 - motion-prime/support/_padding_attribute.rb
+- motion-prime/support/consts.rb
 - motion-prime/support/mp_button.rb
 - motion-prime/support/mp_cell_content_view.rb
 - motion-prime/support/mp_cell_with_section.rb
@@ -404,12 +377,21 @@ files:
 - motion-prime/views/view_styler.rb
 - resources/Default-568h@2x.png
 - resources/Icon.png
+- spec/factories/delegates.rb
+- spec/factories/init.rb
+- spec/factories/models.rb
+- spec/factories/scaffold/models/task.rb
+- spec/factories/scaffold/screens/tasks.rb
+- spec/factories/scaffold/sections/tasks/form.rb
+- spec/factories/scaffold/sections/tasks/index_cell.rb
+- spec/factories/scaffold/sections/tasks/index_table.rb
+- spec/factories/scaffold/sections/tasks/show.rb
+- spec/factories/scaffold/styles/tasks.rb
+- spec/factories/screens.rb
+- spec/factories/sections.rb
+- spec/features/scaffold/index.rb
 - spec/features/screens/open_screen.rb
-- spec/helpers/delegates.rb
-- spec/helpers/init.rb
-- spec/helpers/models.rb
-- spec/helpers/screens.rb
-- spec/helpers/sections.rb
+- spec/helpers/has_content.rb
 - spec/unit/config/store_spec.rb
 - spec/unit/delegate/delegate_spec.rb
 - spec/unit/models/association_collection_spec.rb
@@ -423,7 +405,9 @@ files:
 - spec/unit/models/store_extension_spec.rb
 - spec/unit/models/store_spec.rb
 - spec/unit/prime/env.rb
+- spec/unit/prime/logger.rb
 - spec/unit/screens/screen_spec.rb
+- spec/unit/sections/section_spec.rb
 - travis.sh
 homepage: ''
 licenses:
@@ -450,12 +434,21 @@ signing_key:
 specification_version: 4
 summary: RubyMotion apps development framework
 test_files:
+- spec/factories/delegates.rb
+- spec/factories/init.rb
+- spec/factories/models.rb
+- spec/factories/scaffold/models/task.rb
+- spec/factories/scaffold/screens/tasks.rb
+- spec/factories/scaffold/sections/tasks/form.rb
+- spec/factories/scaffold/sections/tasks/index_cell.rb
+- spec/factories/scaffold/sections/tasks/index_table.rb
+- spec/factories/scaffold/sections/tasks/show.rb
+- spec/factories/scaffold/styles/tasks.rb
+- spec/factories/screens.rb
+- spec/factories/sections.rb
+- spec/features/scaffold/index.rb
 - spec/features/screens/open_screen.rb
-- spec/helpers/delegates.rb
-- spec/helpers/init.rb
-- spec/helpers/models.rb
-- spec/helpers/screens.rb
-- spec/helpers/sections.rb
+- spec/helpers/has_content.rb
 - spec/unit/config/store_spec.rb
 - spec/unit/delegate/delegate_spec.rb
 - spec/unit/models/association_collection_spec.rb
@@ -469,4 +462,6 @@ test_files:
 - spec/unit/models/store_extension_spec.rb
 - spec/unit/models/store_spec.rb
 - spec/unit/prime/env.rb
+- spec/unit/prime/logger.rb
 - spec/unit/screens/screen_spec.rb
+- spec/unit/sections/section_spec.rb