motion-prime 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGYzMDBjMjExMDIwYjViMzBkYjJjNGRjMGY2ZWY3YjFhZjljNGE3Nw==
+    MDQ1ZmFmOTg1ZWQ4MTliMDI3ZmY4ZmE0NGM5OTA2YjJjZjk4NmIxYQ==
   data.tar.gz: !binary |-
-    OWI5ZjA0OThkNzg3NDc5OWFmODBhNWJiNmM2NWFjOTk4YWE3Nzc4Nw==
+    ODQzMzg0NGZiYzgxMDM5MTMwZGEzNGM4ODcwOTg5ZGEzNWE1OTEwMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWJhZDkzYjNmOGEzYjJjN2E2ODQ3M2I2MTc3ZjcwYWExMjM2MDA5MGI5ZjNh
-    NGRhNzM1YmQ1YTcwMTFkM2Y3NmM5YTFiZDI1NDEzZmFiZDI2NWYzOTYyNjAw
-    Y2U2MzljNDNiNmNkMTYwOTE0MGFiYjk0ZmExYmQzZWIwODgzMDI=
+    ZjkyZGFmYTg3NzQ3ZDM0ZGRmOTg4MThiNTNlMDNjNGEwZDc3YTI5YmRhZGFi
+    MGU5ZjQ2MTJiNmIzMzc0YWFmMTg0ZTBhNzY0NzQxMzU3OTFlZDVjNjRkNzA4
+    YjVlM2EzNmU0MTkyOWYxM2I2MTg0N2VlYjg2NmE0NzY4NzA1NWQ=
   data.tar.gz: !binary |-
-    MzliOWY4M2M4ZmNkYTJmNGQ0OTU5Yzc4ZDQ4YzA3MzU5ZWUwMWM3ZjViOTFl
-    MjU5NzFlNGM2NzA5MmNmZWVkZTM4OGUwMTU4NzBmNWMwYzAxMGZjMGE5MWUy
-    N2M0YjQ4ODcxNWJhZWNkZjU3MGJiMTAzOGJjYmZmMWM1MzQ4YjY=
+    NzEwYTA3NjRkMTUxZGQ1NGQzMjk2MTQzMWFlYWM2NzkxZmZkNzkxN2E5NTAy
+    OTg2MWY1ZmMzMzcwYzhmNzYyODIyZTFhNzczM2ZlZTY1OGQ0ZWUwM2E0MDcy
+    ODA2ZTI2MmVkZGRiODljM2NjNmY2MzIzNzRmMTBlNjI1NTFhYjU=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+=== 0.3.1.beta
+* Added universal AppDelegate#open_screen method for opening screens.
+* Old AppDelegate#open_screen method renamed to AppDelegate#open_content_screen
+* Ability to add inherited styles
+* Small refactoring
+* Update project template
+
+
 === 0.3.0
 * Added iOS 7 support
 * Added command line tools

data/Gemfile

@@ -1,7 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'cocoapods', '~> 0.19.1'
-gem 'motion-cocoapods', '~> 1.3.2'
+gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
 gem 'sugarcube', '~> 0.20.23'
 gem 'bubble-wrap', '~> 1.3.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.3.0)
+    motion-prime (0.3.1)
       bubble-wrap
       cocoapods
       methadone
@@ -17,70 +17,57 @@ GEM
     activesupport (3.2.15)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.5)
     bubble-wrap (1.3.0)
-    claide (0.2.0)
-    cocoapods (0.19.1)
-      activesupport (~> 3.2.13)
-      claide (~> 0.2.0)
-      cocoapods-core (= 0.19.1)
-      cocoapods-downloader (~> 0.1.0)
+    claide (0.4.0)
+    cocoapods (0.28.0)
+      activesupport (>= 3.2.15, < 4)
+      claide (~> 0.4.0)
+      cocoapods-core (= 0.28.0)
+      cocoapods-downloader (~> 0.2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      faraday (~> 0.8.1)
-      json (~> 1.7.3)
-      octokit (~> 1.7)
-      open4 (~> 1.3.0)
-      rake (~> 10.0.0)
-      xcodeproj (~> 0.5.5)
-    cocoapods-core (0.19.1)
-      activesupport (~> 3.2.13)
-      rake (~> 10.0.0)
-    cocoapods-downloader (0.1.2)
+      json_pure (~> 1.8)
+      open4 (~> 1.3)
+      xcodeproj (~> 0.14.1)
+    cocoapods-core (0.28.0)
+      activesupport (>= 3.2.15, < 4)
+      fuzzy_match (~> 2.0.4)
+      json (~> 1.8)
+      nap (~> 0.5)
+    cocoapods-downloader (0.2.0)
     colored (1.2)
     escape (0.0.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.5)
+    fuzzy_match (2.0.4)
     i18n (0.6.5)
-    json (1.7.7)
+    json (1.8.1)
+    json_pure (1.8.1)
     methadone (1.3.1)
       bundler
-    motion-cocoapods (1.3.7)
-      cocoapods (>= 0.17.0)
+    motion-cocoapods (1.4.0)
+      cocoapods (>= 0.26.2)
     motion-redgreen (0.1.0)
     motion-require (0.0.7)
     motion-stump (0.3.0)
     motion-support (0.2.5)
       motion-require (>= 0.0.6)
     multi_json (1.8.2)
-    multipart-post (1.2.0)
     nano-store (0.6.3)
       motion-cocoapods (>= 1.2.1)
-    netrc (0.7.7)
-    octokit (1.25.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
+    nap (0.5.1)
     open4 (1.3.0)
-    rake (10.0.4)
+    rake (10.1.0)
     sugarcube (0.20.25)
-    xcodeproj (0.5.5)
-      activesupport (~> 3.2.13)
+    xcodeproj (0.14.1)
+      activesupport (~> 3.0)
       colored (~> 1.2)
+      rake
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bubble-wrap (~> 1.3.0)
-  cocoapods (~> 0.19.1)
-  motion-cocoapods (~> 1.3.2)
+  motion-cocoapods (~> 1.4.0)
   motion-prime!
   motion-redgreen
   motion-stump

data/README.md

@@ -9,13 +9,13 @@ The main feature of MotionPrime is one more layer on UI elements: Section.
 
 ## Getting Started
 
-### 1. Create MotionPrime project:
+### 1. Install MotionPrime:
 
-    $ prime new myapp
+    $ gem install motion-prime
 
-### 2. Setup application
+### 2. Create MotionPrime project:
 
-    # edit Rakefile
+    $ prime new myapp
 
 ### 3. Run application
 
@@ -27,7 +27,7 @@ The main feature of MotionPrime is one more layer on UI elements: Section.
   # app/app_delegate.rb
   class AppDelegate < Prime::BaseAppDelegate
     def on_load(app, options)
-      open_root_screen MainScreen.new
+      open_screen MainScreen.new
     end
   end
 

data/Rakefile

@@ -18,7 +18,6 @@ require 'motion-support'
 require 'motion-prime'
 require 'motion-stump'
 require 'motion-redgreen'
-require 'bubble-wrap/reactor'
 
 Motion::Project::App.setup do |app|
   app.name = 'MotionPrime'

data/bin/{prime.rb → prime}

@@ -28,12 +28,12 @@ class App
     return puts "Usage: prime new <appname>" unless name.to_s.length > 0
     info "Creating new MotionPrime iOS app: #{name}"
     sh "motion create --template=git@github.com:droidlabs/motion-prime.git #{name}"
-    sh "cd ./#{name}"
     info "Command: bundle instal"
-    sh "bundle install"
+    sh "cd ./#{name} & bundle install"
     info "Command: pod setup"
-    sh "pod setup"
-    sh "cd .."
+    sh "cd ./#{name} & pod setup"
+    info "Command: rake pod:install"
+    sh "cd ./#{name} & rake pod:install"
   end
 
   description "Command line tools for MotionPrime"

data/files/Gemfile

@@ -1,10 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'cocoapods', '~> 0.19.1'
-gem 'motion-cocoapods', '~> 1.3.2'
+gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
 gem 'sugarcube', '~> 0.20.23'
 gem 'bubble-wrap', '~> 1.3.0'
-gem 'nano-store', '~> 0.6.3'
 
-gem 'motion-prime', :path => '../motion-prime'
+gem 'motion-prime', '~> 0.3.1'

data/files/Rakefile

@@ -13,6 +13,15 @@ Motion::Project::App.setup do |app|
   app.name = 'MotionPrimeProject'
 
   app.pods do
-
+    pod 'NanoStore', '~> 2.7.7'
+    pod 'SDWebImage'
+    pod 'SVPullToRefresh'
+    pod 'MBAlertView'
+    pod 'SDSegmentedControl'
+    pod 'RESideMenu', git: 'https://github.com/feklistov/RESideMenu.git'
   end
+
+  app.version = '0.0.1'
+  app.icons = %w{Icon.png}
+  app.fonts = ['fonts/ubuntu.ttf']
 end

data/files/app/app_delegate.rb

@@ -1,14 +1,17 @@
 class AppDelegate < Prime::BaseAppDelegate
   def on_load(app, options)
     setup_navigation_styles
-    open_with_sidebar HomeScreen.new(navigation: true), SidebarScreen.new
+    open_screen HomeScreen.new(navigation: true), sidebar: SidebarScreen.new
   end
 
   def setup_navigation_styles
-    # set navigation bar and button backgrounds
-    UINavigationBar.appearance.setBackgroundImage "images/navigation/bg.png".uiimage,
-      forBarMetrics: UIBarMetricsDefault
-    UIBarButtonItem.appearance.setBackgroundImage "images/navigation/button.png".uiimage,
-      forState: UIControlStateNormal, barMetrics:UIBarMetricsDefault
+    bar_appearance = UINavigationBar.appearance
+    bar_appearance.barTintColor = Prime::Config.color.dark.uicolor
+
+    settings = {
+      UITextAttributeFont =>  MP::Config.font.name.uifont(17),
+      UITextAttributeTextColor =>  :white.uicolor
+    }
+    bar_appearance.setTitleTextAttributes(settings)
   end
 end

data/files/app/config/base.rb

@@ -9,5 +9,11 @@ Prime::Config.api do |api|
   api.client_secret = ""
 end
 
+Prime::Config.sidebar do |sidebar|
+  sidebar.background_image = "images/sidebar/bg.jpg".uiimage
+end
+
+Prime::Config.font.name = "Ubuntu"
+
 # setup model's store
 Prime::Store.connect

data/files/app/screens/application_screen.rb

@@ -2,6 +2,6 @@ class ApplicationScreen < Prime::BaseScreen
   before_load :setup_navigation
 
   def setup_navigation
-    set_navigation_left_button 'menu', action: :show_sidebar
+    set_navigation_left_button 'menu', image: 'images/menu_button.png', action: :show_sidebar
   end
 end

data/files/app/screens/help_screen.rb

@@ -1,5 +1,6 @@
 class HelpScreen < ApplicationScreen
+  title 'Help'
+  
   def render
-
   end
 end

data/files/app/screens/home_screen.rb

@@ -1,5 +1,6 @@
 class HomeScreen < ApplicationScreen
-  def render
+  title 'Home'
 
+  def render
   end
 end

data/files/app/styles/sidebar.rb

@@ -1,29 +1,21 @@
 Prime::Styles.define :sidebar do
-  # navigation layout
-  # ----------
   style :screen,
-    background_color: Prime::Config.color.base,
-    opaque: true
-
+    background_color: :clear
   style :table,
-    top: 0,
+    top: 150,
     left: 0,
     width: 320,
     bottom: 0,
-    background_color: Prime::Config.color.base,
-    separator_color: Prime::Config.color.dark,
-    opaque: true
+    background_color: :clear,
+    separator_color: :clear
 
   style :table_cell,
-    selection_style: UITableViewCellSelectionStyleNone,
-    opaque: true
+    selection_style: UITableViewCellSelectionStyleNone
 
   style :action_title,
-    background_color: Prime::Config.color.base,
     text_color: :white,
     top: 10,
     width: 320,
-    opaque: true,
     font: proc { :system.uifont(20) },
     size_to_fit: true,
     left: 20,
@@ -32,7 +24,7 @@ Prime::Styles.define :sidebar do
   style :action_arrow,
     width: 9,
     height: 14,
-    right: 50,
-    top: 14,
-    image: "images/sidebar/icons/arrow.png"
+    right: 150,
+    top: 17,
+    image: "images/sidebar/arrow.png"
 end

data/lib/motion-prime.rb

@@ -4,5 +4,4 @@ Motion::Require.all(Dir.glob(File.expand_path('../../motion-prime/**/*.rb', __FI
 
 Motion::Project::App.setup do |app|
   app.detect_dependencies = false
-  app.fonts = [File.expand_path('../../resources/fonts/ubuntu.ttf', __FILE__)]
 end

data/motion-prime/app_delegate.rb

@@ -1,4 +1,3 @@
-include EM::Eventable
 motion_require './helpers/has_authorization'
 module MotionPrime
   class BaseAppDelegate
@@ -20,6 +19,17 @@ module MotionPrime
       self.app_delegate.window
     end
 
+    def open_screen(screen, options = {})
+      if options[:sidebar]
+        open_with_sidebar(screen, options.delete(:sidebar), options)
+      elsif options[:root]
+        open_root_screen(screen)
+      else
+        open_content_screen(screen)
+      end
+    end
+
+    # TODO: move to private methods
     def open_root_screen(screen)
       screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
       screen.ensure_wrapper_controller_in_place if screen.respond_to?(:ensure_wrapper_controller_in_place)
@@ -32,7 +42,8 @@ module MotionPrime
       screen
     end
 
-    def open_screen(screen)
+    # TODO: move to private methods
+    def open_content_screen(screen)
       if sidebar?
         sidebar_container.content_controller = screen
       else
@@ -40,16 +51,17 @@ module MotionPrime
       end
     end
 
-    def sidebar?
-      self.window.rootViewController.is_a?(SidebarContainerScreen)
-    end
-
-    def open_with_sidebar(content, menu, options={})
-      self.sidebar_container = SidebarContainerScreen.new(menu, content, options)
+    # TODO: move to private methods
+    def open_with_sidebar(content, sidebar, options={})
+      self.sidebar_container = SidebarContainerScreen.new(sidebar, content, options)
       self.sidebar_container.delegate = self
       open_root_screen(sidebar_container)
     end
 
+    def sidebar?
+      self.window.rootViewController.is_a?(SidebarContainerScreen)
+    end
+
     def show_sidebar
       sidebar_container.show_sidebar
     end
@@ -64,10 +76,10 @@ module MotionPrime
       end
     end
 
-    def update_current_user
+    def reset_current_user
       user_was = @current_user
       @current_user = nil
-      NSNotificationCenter.defaultCenter.postNotificationName(:current_user_updated, object: user_was)
+      NSNotificationCenter.defaultCenter.postNotificationName(:on_current_user_reset, object: user_was)
     end
   end
 end

data/motion-prime/config/base.rb

@@ -11,6 +11,9 @@ MotionPrime::Config.color do |color|
   color.base = 0x424242
   color.error = 0xef471f
 end
+MotionPrime::Config.sidebar do |sidebar|
+  sidebar.background_image = "images/sidebar/background.png".uiimage
+end
 MotionPrime::Config.api do |api|
   api.base = "http://example.com"
   api.client_id = ""

data/motion-prime/elements/base.rb

@@ -65,8 +65,8 @@ module MotionPrime
       suffixes = {common: [@view_name.to_sym, name.try(:to_sym)].compact, specific: []}
 
       if section
-        field_section = section.respond_to?(:section_styles)
-        if field_section
+        cell_section = section.is_a?(BaseCellSection)
+        if cell_section
           section.section_styles.each { |type, values| base_styles[type] += values }
         end
         if section.respond_to?(:observing_errors?) && observing_errors? && has_errors?
@@ -76,11 +76,13 @@ module MotionPrime
 
       # common + specific base - common suffixes
       @styles += build_styles_chain(base_styles[:common], suffixes[:common])
-      @styles << :"#{section.name}_#{name}" if section
+      @styles << [section.name, name].compact.join('_').to_sym if section
       @styles += build_styles_chain(base_styles[:specific], suffixes[:common])
       # specific base - specific suffixes
       @styles += build_styles_chain(base_styles[:specific], suffixes[:specific])
-      @styles << :"#{section.form.name}_field_#{section.name}_#{name}" if field_section
+      if cell_section && section.table.present?
+        @styles << [section.table.name, section.cell_type, section.name, name].compact.join('_').to_sym
+      end
       # custom style (from options or block options)
       custom_styles = style_sources.map do |source|
         normalize_object(source.delete(:styles), section)

data/motion-prime/elements/draw/label.rb

@@ -45,7 +45,10 @@ module MotionPrime
 
     def size_to_fit_if_needed
       if computed_options[:size_to_fit]
-        @computed_options[:height] = content_height
+        @computed_options[:width] = content_width
+        if computed_options[:width]
+          @computed_options[:height] = content_height
+        end
         reset_computed_values
       end
     end

data/motion-prime/helpers/has_authorization.rb

@@ -3,8 +3,8 @@ module MotionPrime
     def current_user
       App.delegate.current_user
     end
-    def update_current_user
-      App.delegate.update_current_user
+    def reset_current_user
+      App.delegate.reset_current_user
     end
     def user_signed_in?
       current_user.present?

data/motion-prime/screens/_navigation_mixin.rb

@@ -4,42 +4,36 @@ module MotionPrime
       UIApplication.sharedApplication.delegate
     end
 
+    def show_sidebar
+      app_delegate.show_sidebar
+    end
+
+    def hide_sidebar
+      app_delegate.hide_sidebar
+    end
+
     def open_screen(screen, args = {})
-      # Apply properties to instance
       if args[:modal] || has_navigation?
         screen = setup_screen_for_open(screen, args)
         screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
+        args[:animated] = args.has_key?(:animated) ? args[:animated] : true
         if args[:modal] || !has_navigation?
-          present_modal_view_controller screen, (args.has_key?(:animated) ? args[:animated] : true)
+          open_screen_modal(screen, args)
         else
-          push_view_controller screen, args
+          open_screen_navigational(screen, args)
         end
       else
         app_delegate.open_screen(screen.main_controller)
       end
     end
 
-    def open_root_screen(screen)
-      app_delegate.open_root_screen(screen)
-    end
-
-    def show_sidebar
-      app_delegate.show_sidebar
-    end
-
-    def hide_sidebar
-      app_delegate.hide_sidebar
-    end
-
     def close_screen(args = {})
-      args ||= {}
       args[:animated] = args.has_key?(:animated) ? args[:animated] : true
       # Pop current view, maybe with arguments, if in navigation controller
       if modal?
-        close_modal_screen args
+        close_screen_modal(args)
       elsif has_navigation?
-        close_navigation args
-        send_on_return(args)
+        close_screen_navigational(args)
       end
     end
 
@@ -53,10 +47,6 @@ module MotionPrime
       end
     end
 
-    def push_view_controller(vc, args = {})
-      navigation_controller.pushViewController(vc, animated: (args.has_key?(:animated) ? args[:animated] : true))
-    end
-
     def ensure_wrapper_controller_in_place(args = {})
       # Wrap in a NavigationController?
       if wrap_in_navigation? && !args[:modal]
@@ -64,54 +54,58 @@ module MotionPrime
       end
     end
 
-    protected
+    private
+      def setup_screen_for_open(screen, args = {})
+        # Instantiate screen if given a class
+        screen = screen.new if screen.respond_to?(:new)
 
-    def setup_screen_for_open(screen, args = {})
-      # Instantiate screen if given a class
-      screen = screen.new if screen.respond_to?(:new)
+        # Set parent, title & modal properties
+        screen.parent_screen = self if screen.respond_to?("parent_screen=")
+        screen.title = args[:title] if args[:title] && screen.respond_to?("title=")
+        screen.modal = args[:modal] if args[:modal] && screen.respond_to?("modal=")
 
-      # Set parent, title & modal properties
-      screen.parent_screen = self if screen.respond_to?("parent_screen=")
-      screen.title = args[:title] if args[:title] && screen.respond_to?("title=")
-      screen.modal = args[:modal] if args[:modal] && screen.respond_to?("modal=")
+        # Return modified screen instance
+        screen
+      end
 
-      # Return modified screen instance
-      screen
-    end
+      def open_screen_modal(screen, args)
+        self.presentModalViewController(screen.main_controller, animated: args[:animated])
+      end
 
-    def present_modal_view_controller(screen, animated)
-      self.presentModalViewController(screen.main_controller, animated: animated)
-    end
+      def open_screen_navigational(screen, args = {})
+        navigation_controller.pushViewController(screen, animated: args[:animated])
+      end
 
-    def close_modal_screen(args = {})
-      parent_screen.dismissViewControllerAnimated(args[:animated], completion: lambda {
-        send_on_return(args)
-      })
-    end
+      def close_screen_modal(args = {})
+        parent_screen.dismissViewControllerAnimated(args[:animated], completion: lambda {
+          send_on_return(args)
+        })
+      end
 
-    def close_navigation(args = {})
-      if args[:to_screen] && args[:to_screen].is_a?(UIViewController)
-        self.parent_screen = args[:to_screen]
-        self.navigation_controller.popToViewController(args[:to_screen], animated: args[:animated])
-      else
-        self.navigation_controller.popViewControllerAnimated(args[:animated])
+      def close_screen_navigational(args = {})
+        if args[:to_screen] && args[:to_screen].is_a?(UIViewController)
+          self.parent_screen = args[:to_screen]
+          self.navigation_controller.popToViewController(args[:to_screen], animated: args[:animated])
+        else
+          self.navigation_controller.popViewControllerAnimated(args[:animated])
+        end
+        send_on_return(args)
       end
-    end
 
-    def has_navigation?
-      !navigation_controller.nil?
-    end
+      def has_navigation?
+        !navigation_controller.nil?
+      end
 
-    def navigation_controller
-      @navigation_controller ||= self.navigationController
-    end
+      def navigation_controller
+        @navigation_controller ||= self.navigationController
+      end
 
-    def navigation_controller=(val)
-      @navigation_controller = val
-    end
+      def navigation_controller=(val)
+        @navigation_controller = val
+      end
 
-    def add_navigation_controller
-      self.navigation_controller = NavigationController.alloc.initWithRootViewController(self)
-    end
+      def add_navigation_controller
+        self.navigation_controller = NavigationController.alloc.initWithRootViewController(self)
+      end
   end
 end

data/motion-prime/screens/sidebar_container_screen.rb

@@ -4,7 +4,7 @@ module MotionPrime
 
     def self.new(menu, content, options={})
       screen = self.alloc.initWithContentViewController(nil, menuViewController: nil)
-      screen.backgroundImage = "images/sidebar/background.png".uiimage
+      screen.backgroundImage = MotionPrime::Config.sidebar.background_image
 
       full_width = UIScreen.mainScreen.bounds.size.width
 

data/motion-prime/sections/base.rb

@@ -18,7 +18,7 @@ module MotionPrime
     include MotionPrime::HasAuthorization
     include MotionPrime::HasNormalizer
 
-    attr_accessor :screen, :model, :name, :options, :elements
+    attr_accessor :screen, :model, :name, :options, :elements, :section_styles
     class_attribute :elements_options, :container_options, :keyboard_close_bindings
     define_callbacks :render
 
@@ -30,6 +30,14 @@ module MotionPrime
       load_section
     end
 
+    def style_options
+      @style_options ||= if section_styles.present?
+        Styles.for(section_styles.values.flatten)
+      else
+        {}
+      end
+    end
+
     def container_options
       @normalized_container_options or begin
         # priority: class; from styles; passed directly
@@ -37,16 +45,11 @@ module MotionPrime
         passed_container_options = options.delete(:container) || {}
         raw_container_options.merge!(passed_container_options)
         @normalized_container_options = normalize_options(raw_container_options)
-
         style_container_options = style_options.delete(:container) || {}
         @normalized_container_options.merge!(style_container_options.except(*passed_container_options.keys))
       end
     end
 
-    def style_options
-      {}
-    end
-
     def default_name
       self.class_name_without_kvo.demodulize.underscore.gsub(/\_section$/, '')
     end
@@ -80,7 +83,7 @@ module MotionPrime
       index = opts.delete(:at)
       options = build_options_for_element(opts)
       options[:name] ||= key
-      options[:type] ||= :label
+      options[:type] ||= options[:text] ? :label : :view
       element = MotionPrime::BaseElement.factory(options.delete(:type), options)
       if index
         self.elements = Hash[self.elements.to_a.insert index, [key, element]]

data/motion-prime/sections/form.rb

@@ -2,8 +2,6 @@ motion_require './table.rb'
 motion_require '../helpers/has_style_chain_builder'
 module MotionPrime
   class FormSection < TableSection
-    include HasStyleChainBuilder
-
     # MotionPrime::FormSection is container for Field Sections.
     # Forms are located inside Screen and can contain multiple Field Sections.
     # On render, each field will be added to parent screen.
@@ -41,48 +39,15 @@ module MotionPrime
       end
     end
 
-    def form_styles
-      base_styles = [:base_form]
-      base_styles << :base_form_with_sections unless flat_data?
-      item_styles = [name.to_sym]
-      {common: base_styles, specific: item_styles}
-    end
-
-    def field_styles(field)
-      suffixes = [:field]
-      if field.is_a?(BaseFieldSection)
-        suffixes << field.class_name_without_kvo.demodulize.underscore.gsub(/\_section$/, '')
-      end
-
-      styles = {
-        common: build_styles_chain(form_styles[:common], suffixes),
-        specific: build_styles_chain(form_styles[:specific], suffixes)
-      }
-
-      if field.respond_to?(:container_styles) && field.container_styles.present?
-        styles[:specific] += Array.wrap(field.container_styles)
-      end
-      styles
-    end
-
-    def header_styles(header)
-      suffixes = [:header, :"#{header.name}_header"]
-      styles = {
-        common: build_styles_chain(form_styles[:common], suffixes),
-        specific: build_styles_chain(form_styles[:specific], suffixes)
-      }
-
-      if header.respond_to?(:container_styles) && header.container_styles.present?
-        styles[:specific] += Array.wrap(header.container_styles)
-      end
-      styles
+    def data
+      @data ||= table_data
     end
 
     def render_table
       init_form_fields
       reset_data_stamps
       options = {
-        styles: form_styles.values.flatten,
+        styles: table_styles.values.flatten,
         delegate: self,
         dataSource: self,
         style: (UITableViewStyleGrouped unless flat_data?)}
@@ -91,7 +56,7 @@ module MotionPrime
 
     def render_cell(index, table)
       field = rows_for_section(index.section)[index.row]
-      screen.table_view_cell styles: field_styles(field).values.flatten, reuse_identifier: cell_name(table, index), parent_view: table_view do |cell_view|
+      screen.table_view_cell section: field, styles: cell_styles(field).values.flatten, reuse_identifier: cell_name(table, index), parent_view: table_view do |cell_view|
         field.cell_view = cell_view if field.respond_to?(:cell_view)
         field.render(to: screen)
       end
@@ -233,7 +198,7 @@ module MotionPrime
 
     def load_field(field)
       klass = "MotionPrime::#{field[:type].classify}FieldSection".constantize
-      klass.new(field.merge(form: self))
+      klass.new(field.merge(table: self))
     end
 
     def render_field?(name, options)
@@ -249,7 +214,7 @@ module MotionPrime
 
     def render_header(section)
       return unless options = self.class.section_header_options.try(:[], section)
-      self.section_headers[section] ||= BaseHeaderSection.new(options.merge(form: self))
+      self.section_headers[section] ||= BaseHeaderSection.new(options.merge(table: self))
     end
 
     def header_for_section(section)
@@ -259,7 +224,7 @@ module MotionPrime
 
     def tableView(table, viewForHeaderInSection: section)
       return unless header = header_for_section(section)
-      wrapper = MotionPrime::BaseElement.factory(:view, styles: header_styles(header).values.flatten, parent_view: table_view)
+      wrapper = MotionPrime::BaseElement.factory(:view, styles: cell_styles(header).values.flatten, parent_view: table_view)
       wrapper.render(to: screen) do |cell_view|
         header.cell_view = cell_view if header.respond_to?(:cell_view)
         header.render(to: screen)

data/motion-prime/sections/form/base_field_section.rb

@@ -1,26 +1,19 @@
+motion_require '../table/base_cell_section'
 module MotionPrime
-  class BaseFieldSection < BaseSection
+  class BaseFieldSection < BaseCellSection
     include CellSection
     include BW::KVO
-    attr_accessor :form
 
+    attr_reader :form
     after_render :on_section_render
 
     def initialize(options = {})
-      @form = options.delete(:form)
+      @form = options[:table]
       @errors_observer_options = normalize_options(options.delete(:observe_errors).clone, self) if options[:observe_errors]
       super
       observe_model_errors
     end
 
-    def style_options
-      @style_options ||= Styles.for(section_styles.values.flatten)
-    end
-
-    def section_styles
-      form.try(:field_styles, self)
-    end
-
     def render_element?(element_name)
       case element_name.to_sym
       when :error_message

data/motion-prime/sections/form/base_header_section.rb

@@ -1,23 +1,18 @@
+motion_require '../table/base_cell_section'
 module MotionPrime
-  class BaseHeaderSection < BaseSection
+  class BaseHeaderSection < BaseCellSection
     include CellSection
     DEFAULT_HEADER_HEIGHT = 20
 
     element :title, text: proc { @options[:title] }
 
-    attr_accessor :form
-
     def initialize(options = {})
-      @form = options[:form]
+      @cell_type = :header
       super
     end
 
-    def style_options
-      @style_options ||= Styles.for(section_styles.values.flatten)
-    end
-
     def section_styles
-      form.header_styles(self)
+      table.cell_styles(self)
     end
 
     def container_height

data/motion-prime/sections/table.rb

@@ -2,6 +2,7 @@ motion_require './table/refresh_mixin'
 module MotionPrime
   class TableSection < BaseSection
     include TableSectionRefreshMixin
+    include HasStyleChainBuilder
     include HasSearchBar
 
     attr_accessor :table_element, :did_appear
@@ -12,7 +13,11 @@ module MotionPrime
     end
 
     def data
-      @data ||= table_data
+      @data ||= table_data.tap { |cells| set_cells_table(cells) }
+    end
+
+    def set_cells_table(cells)
+      cells.each { |cell| cell.table = self if cell.respond_to?(:table=) }
     end
 
     def data_stamp_for(id)
@@ -46,15 +51,41 @@ module MotionPrime
     end
 
     def table_styles
-      styles = [:base_table, name.to_sym]
-      styles += @styles if @styles.present?
+      type = self.is_a?(FormSection) ? :base_form : :base_table
+
+      base_styles = [type]
+      base_styles << :"#{type}_with_sections" unless flat_data?
+      item_styles = [name.to_sym]
+      item_styles << @styles if @styles.present?
+      {common: base_styles, specific: item_styles}
+    end
+
+    def cell_styles(cell)
+      # type: cell/field/header
+      type = cell.respond_to?(:cell_type) ? cell.cell_type : 'cell'
+
+      suffixes = [type]
+      if cell.is_a?(BaseFieldSection)
+        suffixes << cell.default_name
+      elsif cell.respond_to?(:cell_name)
+        suffixes << cell.cell_name
+      end
+
+      styles = {
+        common: build_styles_chain(table_styles[:common], suffixes),
+        specific: build_styles_chain(table_styles[:specific], suffixes)
+      }
+
+      if cell.respond_to?(:container_styles) && cell.container_styles.present?
+        styles[:specific] += Array.wrap(cell.container_styles)
+      end
       styles
     end
 
     def render_table
       reset_data_stamps
       options = {
-        styles: table_styles,
+        styles: table_styles.values.flatten,
         delegate: self,
         data_source: self,
         style: (UITableViewStyleGrouped unless flat_data?)
@@ -90,29 +121,19 @@ module MotionPrime
       rows_for_section(index.section)[index.row]
     end
 
+
     def render_cell(index, table)
       item = row_by_index(index)
 
-      # define default styles for cell
-      styles = [:"#{name}_cell"]
-      Array.wrap(@styles).each do |table_style|
-        styles << :"#{table_style}_cell"
-      end
-      if item.respond_to?(:container_styles) && item.container_styles.present?
-        styles += Array.wrap(item.container_styles)
-      end
-      if item.respond_to?(:name) && item.name.present?
-        styles += [item.name.to_sym]
-      end
       # DrawSection allows as to draw inside the cell view, so we can setup
       # to use cell view as container
       if item.is_a?(MotionPrime::DrawSection)
         item.render(to: screen, as: :cell,
-          styles: [:base_table_cell] + styles,
+          styles: cell_styles(item).values.flatten,
           reuse_identifier: cell_name(table, index)
         )
       else
-        screen.table_view_cell styles: [:base_table_cell] + styles, reuse_identifier: cell_name(table, index), parent_view: table_view do
+        screen.table_view_cell section: item, styles: cell_styles(item).values.flatten, reuse_identifier: cell_name(table, index), parent_view: table_view do
           item.render(to: screen)
         end
       end

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

@@ -0,0 +1,26 @@
+module MotionPrime
+  class BaseCellSection < BaseSection
+    attr_accessor :table, :cell_type
+
+    def initialize(options = {})
+      @table ||= options[:table]
+      super
+    end
+
+    def section_styles
+      @table.try(:cell_styles, self) || {}
+    end
+
+    def cell_type
+      @cell_type ||= begin
+        self.is_a?(BaseFieldSection) ? :field : :cell
+      end
+    end
+
+    def cell_name
+      return name unless table
+      table_name = table.name.gsub('_table', '')
+      name.gsub("#{table_name}_", '')
+    end
+  end
+end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/motion-prime/views/styles.rb

@@ -7,21 +7,28 @@ module MotionPrime
       @namespace = namespace
     end
 
-    def style(*args)
+    def style(*args, &block)
       names = Array.wrap(args)
       options = names.pop if args.last.is_a?(Hash)
 
-      raise "No style rules specified for `#{names.join(', ')}`. Namespace: `#{@namespace}`" unless options
-      names.each do |name|
-        name = "#{@namespace}_#{name}".to_sym if @namespace
-
-        @@repo[name] ||= {}
-        if parent = options.delete(:parent)
-          namespace = options.delete(:parent_namspace) || @namespace
-          parent ="#{namespace}_#{parent}".to_sym if namespace
-          @@repo[name].deep_merge! self.class.for(parent)
+      if block_given?
+        raise "Only style names are available for nested styles, received: `#{args.inspect}`. Namespace: `#{@namespace}`" if options.present?
+        names.each do |name|
+          puts namespace = [@namespace, name].compact.join('_')
+          self.class.new(namespace).instance_eval(&block)
+        end
+      else
+        raise "No style rules specified for `#{names.join(', ')}`. Namespace: `#{@namespace}`" unless options
+        parent = options.delete(:parent)
+        namespace = options.delete(:parent_namspace) || @namespace
+        parent ="#{namespace}_#{parent}".to_sym if namespace
+
+        names.each do |name|
+          name = "#{@namespace}_#{name}".to_sym if @namespace
+          @@repo[name] ||= {}
+          @@repo[name].deep_merge!(self.class.for(parent)) if parent
+          @@repo[name].deep_merge! options
         end
-        @@repo[name].deep_merge! options
       end
     end
 

data/motion-prime/views/view_builder.rb

@@ -37,6 +37,10 @@ module MotionPrime
                 text: options.delete(:text),
                 line_spacing: options.delete(:line_spacing)
               }
+              [:text_alignment].each do |key|# add keys which must follow after attributed text here
+                value = options.delete(key)
+                options[key] = value unless value.nil?
+              end
             end
             klass.alloc.initWithFrame CGRectZero
           },

data/motion-prime/views/view_styler.rb

@@ -169,19 +169,22 @@ module MotionPrime
           attributes[NSParagraphStyleAttributeName] = paragrahStyle
         end
 
-
         attributedString = NSAttributedString.alloc.initWithString(value[:text], attributes: attributes)
         if underline_range = value[:underline]
           attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
           attributedString.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
         end
-
         if view.is_a?(UIButton)
           view.setAttributedTitle attributedString, forState: UIControlStateNormal
         else
           view.attributedText = attributedString
         end
-
+      elsif key == 'gradient'
+        gradient = CAGradientLayer.layer
+        gradient.frame = CGRectMake(value[:frame_x].to_f, value[:frame_y].to_f, value[:frame_width].to_f, value[:frame_height].to_f)
+        gradient.colors = value[:colors].map(&:uicolor).map(&:cgcolor)
+        gradient.locations = value[:locations] if value[:locations]
+        view.layer.insertSublayer(gradient, atIndex: 0)
       elsif value.is_a?(Hash)
         self.class.new(view.send(key.camelize(:lower).to_sym), nil, value).apply
       else

data/travis.sh

@@ -2,7 +2,8 @@
 
 sudo gem install bundler
 sudo bundle install
-sudo pod install
+sudo pod setup
+sudo bundle exec rake pod:install
 sudo bundle exec rake clean &&
 sudo bundle exec rake spec &&
 sudo bundle exec rake clean &&

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -168,7 +168,7 @@ description: RubyMotion apps development framework
 email:
 - gvalmon@gmail.com
 executables:
-- prime.rb
+- prime
 extensions: []
 extra_rdoc_files: []
 files:
@@ -180,7 +180,7 @@ files:
 - README.md
 - Rakefile
 - app/app_delegate.rb
-- bin/prime.rb
+- bin/prime
 - doc/FAQ.md
 - doc/SECTION.md
 - doc/STYLE.md
@@ -196,10 +196,12 @@ files:
 - files/app/sections/sidebar/action.rb
 - files/app/sections/sidebar/table.rb
 - files/app/styles/sidebar.rb
-- files/resources/images/navigation/bg.png
-- files/resources/images/navigation/bg@2x.png
-- files/resources/images/navigation/button.png
-- files/resources/images/navigation/button@2x.png
+- files/resources/Default-568h@2x.png
+- files/resources/Default.png
+- files/resources/Default@2x.png
+- files/resources/Icon.png
+- files/resources/fonts/ubuntu.ttf
+- files/resources/images/arrow.png
 - lib/motion-prime.rb
 - motion-prime.gemspec
 - motion-prime/api_client.rb
@@ -261,6 +263,7 @@ files:
 - motion-prime/sections/form/text_with_button_field_section.rb
 - motion-prime/sections/tabbed.rb
 - motion-prime/sections/table.rb
+- motion-prime/sections/table/base_cell_section.rb
 - motion-prime/sections/table/refresh_mixin.rb
 - motion-prime/styles/base.rb
 - motion-prime/styles/form.rb
@@ -280,7 +283,7 @@ files:
 - motion-prime/views/view_builder.rb
 - motion-prime/views/view_styler.rb
 - resources/Default-568h@2x.png
-- resources/fonts/ubuntu.ttf
+- resources/Icon.png
 - spec/config/store_spec.rb
 - spec/delegate/base_delegate_spec.rb
 - spec/helpers/base_delegate.rb