motion-prime 0.5.0 → 0.5.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDU3YTA1M2Q5YjkyMDM0OTcwNDlkNWUxNDIwM2MwY2I3NWY0NjY3Nw==
+    ZWVkMTljOTZkZDI3YThhODdjZGU3OWU4NWE1MzU2ZDY2ZmU1YTY2YQ==
   data.tar.gz: !binary |-
-    NDdkNTIwOTc5ZDA0NmJmY2JiN2RlMmZiMWVjMzkxYmUwNTI0YTc3MQ==
+    ZjExNDBjZmEwZWQ4MWU3NmE5MGJhNmVkNDVmMWUyYmNkN2E3M2JmMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmQ2OGQ0Y2M0NzFkMDZlMmM4ODZmMTlkMGNiODczNWQwZGE5YmQxOTM2MjM0
-    ZmM1MWNlNzVlZmQ5NzgwN2QxM2IyMDc2MTQzYjY5M2FiOTg4N2I2MDkyNzUx
-    NTU5MmNmMTZhZGE4MWM1ZjY5MGUyZmQxM2Y1NjZiMmRiYWIwMjQ=
+    YWE1ZDk0YjZhZTZmYTA0ODg5NzIwYTBjZmU5NzA5OWM4YzVmMzZhOGQzODI1
+    ZDkwNGRhYmE0YjA3NmYyMjBiMzYzZThlMjQyYjVhZGQ4YzAwN2QzOTZiZmE3
+    MTJhMjIwYzBjMDYzOTRkNWIzYmE4YWRhNmI3ZTAwNWY2NmEzNWQ=
   data.tar.gz: !binary |-
-    MWMxM2RiMjM5M2QyZWVjNWNmOWU4ZjI3MGM3ZmM4OWQ4YmIwZDFhMzU1MTQ0
-    ZjgzYjg1NjY5ZGExNmQ0MTU4NDhmYzI4NzQ4MzlkNTk2ZDRmZTIwNTdjOGJi
-    Y2MyNzg5ZDM4Nzg4MzUyNGU5YTBkMWY0YzNiZDViNWMzMDRhNWM=
+    ZTgzMDY0MjA4MGJjYmYxMTA4NDYzOGQ2NTI1MTgzOGNiZTNiMmFkMTA4NWQ5
+    MTkyYzQ1OTIwMGM2ODliZTkwZTYwMTNiZjJkYTE3NzliZDhiNzQwZTM2MjFk
+    NjQ4NTA0YTExMmVhYjNiNGNhNjY2MmM2OTllMGEwMWE1Y2QxNTQ=

data/.gitignore

@@ -6,6 +6,7 @@ resources/*.nib
 resources/*.momd
 resources/*.storyboardc
 files/vendor/
+files/.repl_history
 .DS_Store
 nbproject
 .redcar

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+=== 0.5.1
+* configurations and style definitions runs in correct order.
+
 === 0.5.0
 * renamed Prime::BaseModel to Prime::Model.
 * renamed Prime::BaseScreen to Prime::Screen.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.5.0)
+    motion-prime (0.5.1)
       bubble-wrap
       cocoapods
       methadone

data/README.md

@@ -14,7 +14,12 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
 
     $ prime new myapp
 
-### 3. Run application
+### 3. Setup application
+  
+    $ bundle install
+    $ rake pod:install
+
+### 4. Run application
 
     $ rake
 

data/ROADMAP.md

@@ -1,10 +1,10 @@
 === 0.6.0
-* add configuration initializer.
 * add cleanup for section events
 * add computed_options.get(), this will allow to make sure that options is computed.
 * add dsl for push notifications
 * add some extensions/middleware system, at least for networking.
 * create "display_network_error" extension.
+* add different templates. some templates should be more like final app.
 
 === 0.7.0
 * add testing framework

data/Rakefile

@@ -21,12 +21,4 @@ require 'motion-redgreen'
 
 Motion::Project::App.setup do |app|
   app.name = 'Prime'
-  app.pods do
-    pod 'NanoStore', '~> 2.7.7'
-    pod 'SDWebImage'
-    pod 'SVPullToRefresh'
-    pod 'MBAlertView'
-    pod 'RESideMenu', git: 'https://github.com/feklistov/RESideMenu.git'
-    pod 'MBProgressHUD', '~> 0.8'
-  end
 end

data/files/Gemfile

@@ -5,10 +5,10 @@ gem 'motion-support', '~> 0.2.4'
 gem 'sugarcube', '~> 1.3.7', require: 'sugarcube-classic'
 gem 'bubble-wrap', '~> 1.3.0'
 
-gem 'motion-prime', '~> 0.5.0.beta', path: '../'
+gem 'motion-prime', '~> 0.5.0', path: '../'
 
 # add reside menu for sidebar support
-gem 'prime_reside_menu', '~> 0.1.0'
+gem 'prime_reside_menu', '~> 0.1.3'
 
 # or add sliding menu for sidebar support
 # gem 'prime_sliding_menu', '~> 0.1.0'

data/files/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    motion-prime (0.5.0.beta)
+    motion-prime (0.5.0)
       bubble-wrap
       cocoapods
       methadone
@@ -50,7 +50,7 @@ GEM
     multi_json (1.8.2)
     nap (0.6.0)
     open4 (1.3.0)
-    prime_reside_menu (0.1.0)
+    prime_reside_menu (0.1.3)
       cocoapods
       motion-cocoapods
       motion-require
@@ -67,7 +67,7 @@ PLATFORMS
 DEPENDENCIES
   bubble-wrap (~> 1.3.0)
   motion-cocoapods (~> 1.4.0)
-  motion-prime (~> 0.5.0.beta)!
+  motion-prime (~> 0.5.0)!
   motion-support (~> 0.2.4)
-  prime_reside_menu (~> 0.1.0)
+  prime_reside_menu (~> 0.1.3)
   sugarcube (~> 1.3.7)

data/files/Rakefile

@@ -5,8 +5,6 @@ require "rubygems"
 require 'motion-cocoapods'
 require 'bundler'
 Bundler.require
-require 'sugarcube-common'
-require 'bubble-wrap/reactor'
 require 'motion-prime'
 
 Motion::Project::App.setup do |app|

data/files/app/app_delegate.rb

@@ -6,7 +6,7 @@ class AppDelegate < Prime::BaseAppDelegate
 
   def setup_navigation_styles
     bar_appearance = UINavigationBar.appearance
-    bar_appearance.barTintColor = Prime::Config.color.dark.uicolor
+    bar_appearance.barTintColor = :app_dark.uicolor
 
     settings = {
       UITextAttributeFont =>  Prime::Config.font.name.uifont(17),

data/files/app/config/base.rb

@@ -1,15 +1,14 @@
-Prime::Config.color do |color|
-  color.base = 0x3aa9b6
-  color.dark = 0x41929c
-end
+Prime::Config.configure do |config|
+  config.colors do |colors|
+    colors.base = 0x3aa9b6
+    colors.dark = 0x41929c
+  end
 
-Prime::Config.api do |api|
-  api.base = "http://example.com"
-  api.client_id = ""
-  api.client_secret = ""
-end
+  config.font.name = "Ubuntu"
 
-Prime::Config.font.name = "Ubuntu"
-
-# setup model's store
-Prime::Store.connect
+  config.api do |api|
+    api.base = "http://example.com"
+    api.client_id = ""
+    api.client_secret = ""
+  end
+end

data/files/app/environment.rb

@@ -1,10 +1,5 @@
 module MotionPrime
-  def self.env
-    ENV['PRIME_ENV'] || ENV['RUBYMOTION_ENV'] || 'development'
-  end
-
   def self.root
     File.expand_path File.dirname(__FILE__) + '/../'
   end
-end
-::Prime = MotionPrime unless defined?(::Prime)
+end

data/lib/motion-prime.rb

@@ -1,4 +1,10 @@
 require 'motion-require'
+require 'motion-support'
+require 'sugarcube-common'
+require 'bubble-wrap'
+require 'bubble-wrap/reactor'
+require File.expand_path('../../motion-prime/env.rb', __FILE__)
+require File.expand_path('../../motion-prime/prime.rb', __FILE__)
 
 Motion::Require.all(Dir.glob(File.expand_path('../../motion-prime/**/*.rb', __FILE__)))
 

data/motion-prime/app_delegate.rb

@@ -7,6 +7,9 @@ module MotionPrime
     attr_accessor :window
 
     def application(application, willFinishLaunchingWithOptions:opts)
+      MotionPrime::Config.configure!
+      MotionPrime::Styles.define!
+      Prime.logger.info "Loading Prime application with env: #{Prime.env}"
       application.setStatusBarStyle UIStatusBarStyleLightContent
       application.setStatusBarHidden false
     end

data/motion-prime/config/base.rb

@@ -1,21 +1,18 @@
 motion_require './config.rb'
-MotionPrime::Config.model do |model|
-  if RUBYMOTION_ENV == 'test'
-    model.store_type = :memory
+MotionPrime::Config.configure do |config|
+  if MotionPrime.env.test?
+    config.model.store_type = :memory
   else
-    model.store_type = :file
+    config.model.store_type = :file
+  end
+  config.font.name = "Ubuntu"
+  config.colors do |colors|
+    colors.base = 0x424242
+    colors.error = 0xef471f
+  end
+  config.api do |api|
+    api.base = "http://example.com"
+    api.client_id = ""
+    api.client_secret = ""
   end
-end
-MotionPrime::Config.font.name = "Ubuntu"
-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 = ""
-  api.client_secret = ""
 end

data/motion-prime/config/config.rb

@@ -22,6 +22,10 @@ module MotionPrime
     end
     alias :blank? :nil?
 
+    def present?
+      !blank?
+    end
+
     def has_key?(key)
       !self[key].is_a?(self.class)
     end
@@ -35,6 +39,39 @@ module MotionPrime
         @base_config ||= self.new()
         @base_config.send(name.to_sym, *args, &block)
       end
+
+      def configure(&block)
+        @configure_blocks ||= []
+        @configure_blocks << block
+      end
+
+      def configure!
+        @configure_blocks ||= []
+        @base_config ||= self.new()
+        @configure_blocks.each do |block|
+          block.call(@base_config)
+        end
+        setup_models
+        setup_colors
+      end
+
+      def setup_models
+        MotionPrime::Store.connect
+      end
+
+      def setup_colors
+        return unless @base_config
+        colors = @base_config.colors.to_hash.inject({}) do |res, (color, value)|
+          unless color == :prefix
+            unless @base_config.colors.prefix.nil?
+              res[:"#{@base_config.colors.prefix}_#{color}"] = value
+            end
+            res[:"app_#{color}"] = value
+          end
+          res
+        end
+        Symbol.css_colors.merge!(colors)
+      end
     end
 
     def method_missing(name, *args, &block)
@@ -42,10 +79,13 @@ module MotionPrime
         yield self[name]
       else
         name = name.to_s
-        if /(.+)=$/.match(name)
-          return store($1, args[0])
+        if /(.+)\=$/.match(name)
+          store($1, args[0])
+        elsif /(.+)\?$/.match(name)
+          value = self[$1]
+          value.present? && !!value
         else
-          return self[name]
+          self[name]
         end
       end
     end

data/motion-prime/core_ext/kernel.rb

@@ -1,6 +1,6 @@
 class Kernel
   def pp(*attrs)
-    NSLog([*attrs].map(&:inspect).join(' ') + ' ' + self.class.to_s)
+    NSLog([*attrs].map(&:inspect).join(' '))
   end
 
   def class_name_without_kvo

data/motion-prime/env.rb

@@ -0,0 +1,25 @@
+module MotionPrime
+  class Env
+    def env
+      ENV['PRIME_ENV'] || ENV['RUBYMOTION_ENV'] || 
+      (defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV) || 
+      'development'
+    end
+
+    def to_s
+      env
+    end
+
+    def inspect
+      env
+    end
+
+    def method_missing(name, *args, &block)
+      if /(.+)?$/.match(name.to_s)
+        env == name.to_s.gsub('?', '')
+      else
+        false
+      end
+    end
+  end
+end

data/motion-prime/prime.rb

@@ -12,7 +12,11 @@ module MotionPrime
   end
 
   def self.env
-    ENV['PRIME_ENV'] || ENV['RUBYMOTION_ENV'] || 'development'
+    @env ||= MotionPrime::Env.new
+  end
+
+  def self.logger
+    @logger ||= MotionPrime::Logger.new
   end
 end
 ::Prime = MotionPrime unless defined?(::Prime)

data/motion-prime/services/logger.rb

@@ -6,31 +6,33 @@ module MotionPrime
 
     class_attribute :level
 
-    class << self
-      def error(*args)
-        pp(*args) if LOGGER_ERROR_LEVEL <= current_level
-      end
+    def initialize
+      @default_level = Config.logger.level.nil? ? :info : Config.logger.level
+    end
 
-      def info(*args)
-        pp(*args) if LOGGER_INFO_LEVEL <= current_level
-      end
+    def error(*args)
+      pp(*args) if LOGGER_ERROR_LEVEL <= current_level
+    end
 
-      def debug(*args)
-        pp(*args) if LOGGER_DEBUG_LEVEL <= current_level
-      end
+    def info(*args)
+      pp(*args) if LOGGER_INFO_LEVEL <= current_level
+    end
+
+    def debug(*args)
+      pp(*args) if LOGGER_DEBUG_LEVEL <= current_level
+    end
 
-      def current_level
-        current_level = self.level || (Config.logger.level.nil? ? :info : Config.logger.level)
-        case current_level.to_s
-        when 'error'
-          LOGGER_ERROR_LEVEL
-        when 'info'
-          LOGGER_INFO_LEVEL
-        when 'debug'
-          LOGGER_DEBUG_LEVE
-        else
-          2
-        end
+    def current_level
+      current_level = self.class.level || @default_level
+      case current_level.to_s
+      when 'error'
+        LOGGER_ERROR_LEVEL
+      when 'info'
+        LOGGER_INFO_LEVEL
+      when 'debug'
+        LOGGER_DEBUG_LEVE
+      else
+        2
       end
     end
   end

data/motion-prime/styles/form.rb

@@ -41,7 +41,7 @@ MotionPrime::Styles.define :base_form do
     line_break_mode: :word_wrap,
     number_of_lines: 0,
     size_to_fit: true,
-    text_color: proc { MotionPrime::Config.color.error },
+    text_color: :app_error,
     font: proc { MotionPrime::Config.font.name.uifont(12) }
 
   # available options for input:
@@ -105,9 +105,9 @@ MotionPrime::Styles.define :base_form do
 
   style :field_input_with_errors,
     layer: {
-      border_color: proc { MotionPrime::Config.color.error }
+      border_color: :app_error
     },
-    text_color: proc { MotionPrime::Config.color.error }
+    text_color: :app_error
 
   style :switch_field_input,
     top: 10,

data/{files/app → motion-prime}/styles/sidebar.rb

@@ -1,13 +1,13 @@
 Prime::Styles.define :sidebar do
   style :screen,
-    background_color: proc { Prime::Config.color.dark }
+    background_color: :app_dark
 
   style :table,
     top: 150,
     left: 0,
     width: 320,
     bottom: 0,
-    background_color: proc { Prime::Config.color.dark },
+    background_color: :app_dark,
     separator_color: :clear
 
   style :table_cell,
@@ -20,4 +20,4 @@ Prime::Styles.define :sidebar do
     width: 320,
     font: proc { :system.uifont(20) },
     size_to_fit: true
-end
+end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/motion-prime/views/styles.rb

@@ -39,8 +39,21 @@ module MotionPrime
       include HasNormalizer
 
       def define(*namespaces, &block)
-        Array.wrap(namespaces).each do |namespace|
-          self.new(namespace).instance_eval(&block)
+        @definition_blocks ||= []
+        namespaces = Array.wrap(namespaces)
+        if namespaces.any?
+          namespaces.each do |namespace|
+            @definition_blocks << {namespace: namespace, block: block}
+          end
+        else
+          @definition_blocks << {namespace: false, block: block}
+        end
+      end
+
+      def define!
+        @definition_blocks.each do |definition|
+          block = definition[:block]
+          self.new(definition[:namespace]).instance_eval(&block)
         end
       end
 

data/spec/config/store_spec.rb

@@ -35,6 +35,22 @@ describe MotionPrime::Config do
     end
   end
 
+  describe ":key_name?" do
+    it "returns true if there is value and it's not false" do
+      @config.foo = true
+      @config.foo?.should == true
+    end
+
+    it "returns false if there is value and it's false" do
+      @config.foo = false
+      @config.foo?.should == false
+    end
+
+    it "returns false if there is no value" do
+      @config.foo?.should == false
+    end
+  end
+
   describe "class methods" do
     it "should allow to set value for class" do
       MotionPrime::Config.foo.nil?.should == true

data/spec/helpers/init.rb

@@ -0,0 +1,2 @@
+MotionPrime::Config.configure!
+MotionPrime::Styles.define!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -204,7 +204,6 @@ files:
 - files/app/sections/sidebar/action.rb
 - files/app/sections/sidebar/table.rb
 - files/app/styles/home.rb
-- files/app/styles/sidebar.rb
 - files/resources/Default-568h@2x.png
 - files/resources/Default.png
 - files/resources/Default@2x.png
@@ -240,6 +239,7 @@ files:
 - motion-prime/elements/text_field.rb
 - motion-prime/elements/text_view.rb
 - motion-prime/elements/view_with_section.rb
+- motion-prime/env.rb
 - motion-prime/helpers/has_authorization.rb
 - motion-prime/helpers/has_class_factory.rb
 - motion-prime/helpers/has_normalizer.rb
@@ -290,6 +290,7 @@ files:
 - motion-prime/styles/_mixins.rb
 - motion-prime/styles/base.rb
 - motion-prime/styles/form.rb
+- motion-prime/styles/sidebar.rb
 - motion-prime/support/_key_value_store.rb
 - motion-prime/support/_padding_attribute.rb
 - motion-prime/support/mp_button.rb
@@ -313,6 +314,7 @@ files:
 - spec/config/store_spec.rb
 - spec/delegate/delegate_spec.rb
 - spec/helpers/delegates.rb
+- spec/helpers/init.rb
 - spec/helpers/models.rb
 - spec/helpers/screens.rb
 - spec/models/associations_spec.rb
@@ -353,6 +355,7 @@ test_files:
 - spec/config/store_spec.rb
 - spec/delegate/delegate_spec.rb
 - spec/helpers/delegates.rb
+- spec/helpers/init.rb
 - spec/helpers/models.rb
 - spec/helpers/screens.rb
 - spec/models/associations_spec.rb