motion-prime 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTVhZjliNTBlNWFkYWY5ODA2NGEzYmFiYmQ2OTZlMTUwODZjNzNkNw==
+    NGYzMDBjMjExMDIwYjViMzBkYjJjNGRjMGY2ZWY3YjFhZjljNGE3Nw==
   data.tar.gz: !binary |-
-    YmRkODY4MTE5ZmUzNDZiMzE1YmU0MGVhN2YxOTQyOTgzM2YxOGY2Yg==
+    OWI5ZjA0OThkNzg3NDc5OWFmODBhNWJiNmM2NWFjOTk4YWE3Nzc4Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmJiMTg3YmM4ZjIxNGNhZWM5Njc5NzEwNmIyNTI4MTMyYzk0ODRiYzQzZTRm
-    MWIwNzdkNTBmMmM3NWZiYTNjNmY4NTRiZWUzZDVmODY5NTI4ZWRiNzY0MWVj
-    NzNlYTZkMTQ3YTMyOTFhOGZiYmM5ZDk0OWZhNzkyMzczMzJlMTk=
+    ZWJhZDkzYjNmOGEzYjJjN2E2ODQ3M2I2MTc3ZjcwYWExMjM2MDA5MGI5ZjNh
+    NGRhNzM1YmQ1YTcwMTFkM2Y3NmM5YTFiZDI1NDEzZmFiZDI2NWYzOTYyNjAw
+    Y2U2MzljNDNiNmNkMTYwOTE0MGFiYjk0ZmExYmQzZWIwODgzMDI=
   data.tar.gz: !binary |-
-    YTY0NjliMWM1Y2Q4NGMyMjc3OTcwOThjNTUxNGYxM2JiNjc0NzVkZTdlZmI4
-    NjliNjlmZjJjNTVjN2Q1ZjU5MjBlYzdlNmNkMjEzM2FkNjgwZDU0YjI5Mzcw
-    YTM1ZjE3ZjJjOWE5NTI1ODAwN2M2OTMwNjBkN2VlMGEyOGExYjE=
+    MzliOWY4M2M4ZmNkYTJmNGQ0OTU5Yzc4ZDQ4YzA3MzU5ZWUwMWM3ZjViOTFl
+    MjU5NzFlNGM2NzA5MmNmZWVkZTM4OGUwMTU4NzBmNWMwYzAxMGZjMGE5MWUy
+    N2M0YjQ4ODcxNWJhZWNkZjU3MGJiMTAzOGJjYmZmMWM1MzQ4YjY=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+=== 0.3.0
+* Added iOS 7 support
+* Added command line tools
+* Many bug fixes
+
 === 0.2.1
 * Bug fixes
 

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.2.1)
+    motion-prime (0.3.0)
       bubble-wrap
       cocoapods
+      methadone
       motion-cocoapods
       motion-require
       motion-support
@@ -13,8 +14,8 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
     bubble-wrap (1.3.0)
@@ -35,24 +36,26 @@ GEM
     cocoapods-core (0.19.1)
       activesupport (~> 3.2.13)
       rake (~> 10.0.0)
-    cocoapods-downloader (0.1.1)
+    cocoapods-downloader (0.1.2)
     colored (1.2)
     escape (0.0.4)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     hashie (2.0.5)
-    i18n (0.6.1)
+    i18n (0.6.5)
     json (1.7.7)
-    motion-cocoapods (1.3.2)
+    methadone (1.3.1)
+      bundler
+    motion-cocoapods (1.3.7)
       cocoapods (>= 0.17.0)
     motion-redgreen (0.1.0)
     motion-require (0.0.7)
     motion-stump (0.3.0)
-    motion-support (0.2.4)
+    motion-support (0.2.5)
       motion-require (>= 0.0.6)
-    multi_json (1.7.7)
+    multi_json (1.8.2)
     multipart-post (1.2.0)
     nano-store (0.6.3)
       motion-cocoapods (>= 1.2.1)
@@ -66,7 +69,7 @@ GEM
       netrc (~> 0.7.7)
     open4 (1.3.0)
     rake (10.0.4)
-    sugarcube (0.20.23)
+    sugarcube (0.20.25)
     xcodeproj (0.5.5)
       activesupport (~> 3.2.13)
       colored (~> 1.2)

data/README.md

@@ -11,31 +11,28 @@ The main feature of MotionPrime is one more layer on UI elements: Section.
 
 ### 1. Create MotionPrime project:
 
-    $ motion create --template=git@github.com:droidlabs/motion-prime.git myapp
+    $ prime new myapp
 
-### 2. Install gems
-
-    $ bundle
-
-### 3. Setup application
+### 2. Setup application
 
     # edit Rakefile
 
-### 4. Run application
+### 3. Run application
 
     $ rake
 
 ## Hello World (Sample)
+
 ```ruby
   # app/app_delegate.rb
-  class AppDelegate < MotionPrime::BaseAppDelegate
+  class AppDelegate < Prime::BaseAppDelegate
     def on_load(app, options)
       open_root_screen MainScreen.new
     end
   end
 
   # app/screens/main_screen.rb
-  class MainScreen < ApplicationScreen
+  class MainScreen < Prime::BaseScreen
     title 'Main screen'
 
     def render
@@ -45,13 +42,13 @@ The main feature of MotionPrime is one more layer on UI elements: Section.
   end
 
   # app/sections/my_profile.rb
-  class MyProfileSection < MotionPrime::BaseSection
+  class MyProfileSection < Prime::BaseSection
     element :title, text: "Hello World"
     element :avatar, image: "images/avatar.png", type: :image
   end
 
   # app/styles/my_profile.rb
-  MotionPrime::Styles.define :my_profile do
+  Prime::Styles.define :my_profile do
     style :title,
       width: 300, height: 20, color: :black,
       top: 10, left: 5, background_color: :white

data/Rakefile

@@ -18,14 +18,15 @@ 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'
   app.pods do
-    pod 'PKRevealController'
     pod 'NanoStore', '~> 2.7.7'
     pod 'SDWebImage'
     pod 'SVPullToRefresh'
     pod 'MBAlertView'
+    pod 'RESideMenu', git: 'https://github.com/feklistov/RESideMenu.git'
   end
 end

data/bin/prime.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'methadone'
+require_relative '../motion-prime/version'
+
+class App
+  include Methadone::Main
+  include Methadone::CLILogging
+  include Methadone::SH
+  
+  main do |command, opt|
+    case command.to_sym
+    when :new then create(opt)
+    else help
+    end
+    0
+  end
+
+  def self.help
+    info "Command line tools for MotionPrime"
+    info "Commands:"
+    info "  new <appname>"
+    info "    Creates a new MotionPrime app from a template."
+  end
+
+  def self.create(name)
+    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"
+    info "Command: pod setup"
+    sh "pod setup"
+    sh "cd .."
+  end
+
+  description "Command line tools for MotionPrime"
+
+  arg :command
+  arg :opt, :optional
+
+  version MotionPrime::VERSION
+
+  go!
+end

data/doc/FAQ.md

@@ -1,2 +1,2 @@
 Q: Error: `Unable to find a specification for `Something``
-A: Try running `pod install`
+A: Try running `pod setup`

data/files/app/app_delegate.rb

@@ -1,4 +1,4 @@
-class AppDelegate < MotionPrime::BaseAppDelegate
+class AppDelegate < Prime::BaseAppDelegate
   def on_load(app, options)
     setup_navigation_styles
     open_with_sidebar HomeScreen.new(navigation: true), SidebarScreen.new

data/files/app/config/base.rb

@@ -1,9 +1,13 @@
-MP = MotionPrime unless defined?(MP)
-
-MP::Config.color do |color|
+Prime::Config.color do |color|
   color.base = 0x3aa9b6
   color.dark = 0x41929c
 end
 
+Prime::Config.api do |api|
+  api.base = "http://example.com"
+  api.client_id = ""
+  api.client_secret = ""
+end
+
 # setup model's store
-MP::Store.connect
+Prime::Store.connect

data/files/app/screens/application_screen.rb

@@ -1,4 +1,4 @@
-class ApplicationScreen < MotionPrime::BaseScreen
+class ApplicationScreen < Prime::BaseScreen
   before_load :setup_navigation
 
   def setup_navigation

data/files/app/screens/sidebar_screen.rb

@@ -1,4 +1,4 @@
-class SidebarScreen < MotionPrime::BaseScreen
+class SidebarScreen < Prime::BaseScreen
   def render
     @main_section = SidebarTableSection.new()
     @main_section.render(to: self)

data/files/app/sections/sidebar/action.rb

@@ -1,4 +1,4 @@
-class SidebarActionSection < MotionPrime::BaseSection
+class SidebarActionSection < Prime::BaseSection
   container height: 43
   element :title, text: proc { model[:title] }
   element :arrow, type: :image

data/files/app/sections/sidebar/table.rb

@@ -1,4 +1,4 @@
-class SidebarTableSection < MotionPrime::TableSection
+class SidebarTableSection < Prime::TableSection
   def sidebar_items
     [
       {title: 'Home Screen', action: :open_home},

data/files/app/styles/sidebar.rb

@@ -1,8 +1,8 @@
-MotionPrime::Styles.define :sidebar do
+Prime::Styles.define :sidebar do
   # navigation layout
   # ----------
   style :screen,
-    background_color: MP::Config.color.base,
+    background_color: Prime::Config.color.base,
     opaque: true
 
   style :table,
@@ -10,8 +10,8 @@ MotionPrime::Styles.define :sidebar do
     left: 0,
     width: 320,
     bottom: 0,
-    background_color: MP::Config.color.base,
-    separator_color: MP::Config.color.dark,
+    background_color: Prime::Config.color.base,
+    separator_color: Prime::Config.color.dark,
     opaque: true
 
   style :table_cell,
@@ -19,7 +19,7 @@ MotionPrime::Styles.define :sidebar do
     opaque: true
 
   style :action_title,
-    background_color: MP::Config.color.base,
+    background_color: Prime::Config.color.base,
     text_color: :white,
     top: 10,
     width: 320,

data/motion-prime.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bubble-wrap'
   spec.add_dependency 'sugarcube'
   spec.add_dependency 'nano-store'
+  spec.add_dependency("methadone")
 end

data/motion-prime/api_client.rb

@@ -0,0 +1,81 @@
+class ApiClient
+  attr_accessor :access_token
+
+  def initialize(options = {})
+    self.access_token = options[:access_token]
+  end
+
+  def parse_json(text)
+    BW::JSON.parse(text)
+  rescue
+    puts "Can't parse json: #{text}"
+    false
+  end
+
+  def request_params(data)
+    files = data.delete(:files)
+    params = {payload: data, no_redirect: true, format: :form_data}
+    if files.present?
+      params.merge!(files: files)
+    end
+    if MotionPrime::Config.api.http_auth.present?
+      params.merge!(credentials: MotionPrime::Config.api.http_auth.to_hash)
+    end
+    params
+  end
+
+  def authenticate(username, password, &block)
+    data = {
+      grant_type: "password",
+      username: username,
+      password: password,
+      client_id: MotionPrime::Config.api.client_id,
+      client_secret: MotionPrime::Config.api.client_secret
+    }
+    use_callback = block_given?
+    BW::HTTP.post("#{MotionPrime::Config.api.base}/oauth/token", request_params(data)) do |response|
+      access_token = if response.ok?
+        json = parse_json(response.body)
+        json[:access_token]
+      else
+        false
+      end
+      self.access_token = access_token
+      block.call(access_token) if use_callback
+    end
+    true
+  end
+
+  def api_url(path)
+    return path if path =~ /^http(s)?:\/\//
+    "#{MotionPrime::Config.api.base}/api/v1#{path}"
+  end
+
+  def resource_url(path)
+    "#{MotionPrime::Config.api.base}#{path}"
+  end
+
+  def request(method, path, params = {}, &block)
+    params.merge!(access_token: access_token)
+    BW::HTTP.send method, api_url(path), request_params(params) do |response|
+      json = parse_json(response.body.to_s)
+      block.call(json, response.status_code)
+    end
+  end
+
+  def get(path, params = {}, &block)
+    request(:get, path, params, &block)
+  end
+
+  def put(path, params = {}, &block)
+    request(:put, path, params, &block)
+  end
+
+  def post(path, params = {}, &block)
+    request(:post, path, params, &block)
+  end
+
+  def delete(path, params = {}, &block)
+    request(:delete, path, params, &block)
+  end
+end

data/motion-prime/app_delegate.rb

@@ -1,3 +1,4 @@
+include EM::Eventable
 motion_require './helpers/has_authorization'
 module MotionPrime
   class BaseAppDelegate
@@ -5,21 +6,24 @@ module MotionPrime
 
     attr_accessor :window, :sidebar_container
 
+    def application(application, willFinishLaunchingWithOptions:opts)
+      application.setStatusBarStyle UIStatusBarStyleLightContent
+      application.setStatusBarHidden false
+    end
+
     def application(application, didFinishLaunchingWithOptions:launch_options)
       on_load(application, launch_options)
       true
     end
 
-    def app_delegate
-      UIApplication.sharedApplication.delegate
-    end
-
     def app_window
       self.app_delegate.window
     end
 
     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)
+
       screen = screen.main_controller if screen.respond_to?(:main_controller)
 
       self.window ||= UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
@@ -37,11 +41,12 @@ module MotionPrime
     end
 
     def sidebar?
-      !sidebar_container.nil?
+      self.window.rootViewController.is_a?(SidebarContainerScreen)
     end
 
     def open_with_sidebar(content, menu, options={})
       self.sidebar_container = SidebarContainerScreen.new(menu, content, options)
+      self.sidebar_container.delegate = self
       open_root_screen(sidebar_container)
     end
 
@@ -52,5 +57,17 @@ module MotionPrime
     def hide_sidebar
       sidebar_container.hide_sidebar
     end
+
+    def current_user
+      @current_user ||= if defined?(User) && User.respond_to?(:current)
+        User.current
+      end
+    end
+
+    def update_current_user
+      user_was = @current_user
+      @current_user = nil
+      NSNotificationCenter.defaultCenter.postNotificationName(:current_user_updated, object: user_was)
+    end
   end
 end