ruby_motion_query 0.3.6 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGJlZGVhZTBlMjc4NGFiMzhkODI1ODQ0ODI5YWJjMjBjMWQ2MGJmNw==
+    YWZiNGJkMWFiMTc2YjliNjFhYjQxZWE4YTEwYmNkYWM1Yzg0NTViZA==
   data.tar.gz: !binary |-
-    MmVkZTA5ZjU1YTg0YmViMDYzMmY4NWUzOWFkZDg0MWM0NmVlZWZkOQ==
+    MjlhMTIzYmUwYmJiNDhhZjE2YWI3NTlkM2IwYzY4YzE1NjhhNTQwOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjczODk0ZjM4ZmM4ZDc1YmEzMzBlNGFlNGU5YTc5MzU1ZmEzY2ZlYTE1ZDBl
-    MDVhYjkwYWY3Zjg0NDViNjkzM2RiNWMzYWQxOTgxMWYzYzY1NzNkN2EyODBi
-    MTcwNTJmOTJiZmNlYjhlMzkxZDg4MDFhNTEzOWI5NWE0OTAzZmQ=
+    MTM3YWEyYjY3YTMyZDVhZDk5NGZkZGRiODZiNzA1NzUxYzZjZTJlNTQyNDFk
+    NDc5MDIxNjFiY2UxMDhkY2ZkODJjNjhmMTI0NzYwNWFiMWRmYWJlZWIzYWIz
+    ZDUwYmNkN2U2YmZjMTYyOTVjNjkxNzQ1YWMyNDg0MjlmMWMzOGY=
   data.tar.gz: !binary |-
-    NGQyNWY0MDExOTNjNzdmNGQ0MzQ0YjA3YzA3NmM4OTFhYTU5Mjk4YWQ5Njc1
-    MjkwYzY0NGU4NmZjZDE0NGYwMDFmNTQ3ZmMzNzllYWRlM2JiNTE2ZjMwMzgx
-    YTIyOTY1NWZiMjY3ODI1OTNiZWQ5MTNiMTJjNTdlMTgyOWVhNDA=
+    YmExY2QwZDU1NTc3NjA3MGQ2MDFkMmE2ZWNhM2MyNDI2Y2Y2YjhiZmY0YjM0
+    NWQ1M2UzMDYzODBjZWM0ZTg5ZGE4NmJkYjUyZGY4ZGYzZGE0YjJmNmQxZGY0
+    NjczZWE1MmI3ZDIzZDZmNDk1Zjk1MjRhNzA2Mzg0ZjE0Mjc2MzM=

data/README.md

@@ -1,7 +1,7 @@
 ![RQM logo](http://ir_wp.s3.amazonaws.com/wp-content/uploads/sites/9/2013/07/rmq_logo.png)
 
 # RubyMotionQuery - RMQ
-A light, muggle, nonpolluting, jQuery-like library for [RubyMotion](http://rubymotion.com).
+A fast, muggle, nonpolluting, jQuery-like library for [RubyMotion](http://rubymotion.com).
 
 **The [RMQ Introductory Guide and other info][1] is a great place to start.**
 
@@ -40,17 +40,39 @@ RMQ **doesn't require any** other wrapper or gem.
 Some of the code in RMQ came from BubbleWrap and Sugarcube. Not too much but some did. I thank you BubbleWrap and Sugarcube teams for your work.
 
 ## Quick Start
-- `gem install ruby_motion_query`
-- `rmq create my_app`
-- `cd my_app`
-- `bundle`
-- `rake retina=4`
+
+```
+gem install ruby_motion_query
+rmq create my_app
+cd my_app
+bundle
+rake
+```
+
+Or, if you use **rbenv**:
+
+```
+gem install ruby_motion_query
+rmq create my_app
+rbenv rehash
+cd my_app
+bundle
+rake
+```
+
 
 ## Installation
 
 RMQ **requires no other gems**. If you use stuff like **scale** and certain animations it will require some frameworks (like QuartzCore or CoreGraphics)
 
 - `gem install ruby_motion_query`
+
+If you use rbenv
+
+- `rbenv rehash`
+
+Require it
+
 - `require 'ruby_motion_query'`
 
 or add it to your `Gemfile`:
@@ -68,7 +90,7 @@ for **bleeding edge**, add this to your `Gemfile`:
 
 	git clone git@github.com:infinitered/rmq.git
 	cd rmq
-	rake retina=4
+	rake
 
 The example app works in any orientation, on both iPhone and iPad. Notice how the benchmark popup is done with RMQ, then think about how you'd do that without it.
 
@@ -142,6 +164,33 @@ rmq(my_view).get
 rmq(UILabel).get
 ```
 
+### Command-line Tool
+
+RMQ provides a command-line tool, mostly for generating files:
+```
+> rmq create my_app
+```
+
+Here are the commands available to you:
+```
+ > rmq api
+ > rmq docs
+
+ > rmq create my_new_app
+ > rmq create model foo
+ > rmq create controller bar
+ > rmq create view foo_bar
+ > rmq create shared some_class_used_app_wide
+ > rmq create lib some_class_used_by_multiple_apps
+
+ # To test the create command without actually creating any files, do:
+ > rmq create view my_view dry_run
+
+ > rmq help
+```
+
+
+
 ### Selectors
 
  - Constant
@@ -410,6 +459,7 @@ rmq(my_view).animations.fade_out(duration: 0.8)
 
 rmq(my_view).animations.blink
 rmq(my_view).animations.throb
+rmq(my_view).animations.drop_and_spin
 
 rmq.animations.start_spinner
 rmq.animations.stop_spinner
@@ -575,6 +625,7 @@ The following are the only pollution in RMQ
      - your_controller.rb
      - your_other_controller.rb
    - models
+   - shared
    - stylers
          - ui_view_styler.rb 
          - ui_button_styler.rb
@@ -583,7 +634,47 @@ The following are the only pollution in RMQ
      - application_stylesheet.rb (inherit from RubyMotionQuery::Stylesheet)
      - your_stylesheet.rb (inherit from ApplicationStylesheet)
      - your_other_stylesheet.rb (inherit from ApplicationStylesheet)
+     - your_view_stylesheet.rb (module, included an any controller's stylesheet that needs it)
    - views
+ - lib
+ - resource
+ - spec
+   - controllers
+   - lib
+   - models
+   - shared
+   - stylers
+   - views
+
+### Debugging 
+
+Adding rmq_debug=true to rake turns on some debugging features that are too slow or verbose to include in a normal build.  It's great for normal use in the simulator, but you'll want to leave it off if you're measuring performance.
+```
+rake rmq_debug=true
+```
+
+Use this to add your optional debugging code
+```ruby
+rmq.debugging?
+=> true
+```
+
+```ruby
+rmq.log :tree
+rmq.all.log
+rmq.all.log :wide
+
+rmq(Section).log :tree
+# 163792144 is the ID a button
+rmq(163792144).style{|st| st.background_color = rmq.color.blue}
+
+rmq(Section).children.and_self.log :wide
+
+rmq(UILabel).animations.blink
+
+# Show subview index and thus zorder of Section within Section's parent
+rmq(Section).parent.children.log
+```
 
 ----------
 
@@ -898,6 +989,7 @@ def ui_view_kitchen_sink(st)
   st.background_color = color.red
 
   st.scale = 1.5
+  st.rotation = 45
 end
 ```
 

data/bin/rmq

@@ -1,37 +1,158 @@
 #!/usr/bin/env ruby
 
+require "erb"
+require "rubygems"
+
+$:.unshift(File.join(File.dirname(__FILE__), "/../motion/ruby_motion_query"))
+require "version"
+
+class RmqCommandLine
+  HELP_TEXT = %{     rmq version #{RubyMotionQuery::VERSION}
+
+     Some things you can do with the rmq command:
+     > rmq api
+     > rmq docs
+
+     > rmq create my_new_app
+
+     > rmq create model foo
+     > rmq create controller foos
+     > rmq create view bar
+     > rmq create shared some_class_used_app_wide
+     > rmq create lib some_class_used_by_multiple_apps
+
+     > rmq -h, --help
+     > rmq -v, --version }
+
+  class << self
+    VALID_CREATE_TYPES = [:model, :controller, :view, :shared, :lib]
+
+    def create(template_or_app_name, name, options)
+      @dry_run = true if options == 'dry_run'
+
+      if name
+        if VALID_CREATE_TYPES.include?(template_or_app_name.to_sym)
+          insert_from_template(template_or_app_name, name)
+        else
+          puts "RMQ - Invalid command, do something like this: rmq create controller my_controller\n"
+        end
+      else
+        create_app(template_or_app_name)
+      end
+    end
+
+    def create_app(app_name)
+      puts '     Creating app'
+
+      `motion create --template=git@github.com:infinitered/rmq-template.git #{app_name}`
+
+      puts %{
+      Complete. Things you should do:
+      > cd #{app_name}
+      > bundle
+      > rake spec
+      > rake
+      (main)> exit
+
+      Then try these:
+      > rake retina=3.5
+      > rake retina=4 
+      > rake device_family=ipad 
+      > rake device }
+
+    end
+
+    def template_path(template_name)
+      sub_path = "templates/#{template_name}/"
+
+      # First check local directory, use that if it exists
+      if Dir.exist?("#{Dir.pwd}/#{sub_path}")
+        "#{Dir.pwd}/#{sub_path}"
+      else # Then check the gem
+        begin
+          spec = Gem::Specification.find_by_name("ruby_motion_query")
+          gem_root = spec.gem_dir
+          "#{gem_root}/#{sub_path}"
+        rescue Exception => e
+          puts "RMQ - could not find template directory\n"
+          nil
+        end
+      end
+    end
+
+    def insert_from_template(template_name, name)
+      puts "\n     Creating #{template_name}: #{name}\n\n"
+
+      return unless (@template_path = template_path(template_name))
+      files = Dir["#{@template_path}**/*"].select {|f| !File.directory? f}
+
+      @name = name.gsub(/(controller|stylesheet)/,'')
+      @name_camel_case = @name.split('_').map{|word| word.capitalize}.join
+
+      files.each do |template_file_path_and_name|
+        @in_app_path = File.dirname(template_file_path_and_name).gsub(@template_path, '')
+        @ext = File.extname(template_file_path_and_name)
+        @file_name = File.basename(template_file_path_and_name, @ext)
+        
+        @new_file_name = @file_name.gsub('name', @name)
+        @new_file_path_name = "#{Dir.pwd}/#{@in_app_path}/#{@new_file_name}#{@ext}"
+
+        if @dry_run
+          puts "\n     Instance vars:"
+          self.instance_variables.each{|var| puts "     #{var} = #{self.instance_variable_get(var)}"} 
+          puts
+        end
+
+        if Dir.exist?(@in_app_path)
+          puts "     Using existing directory: #{@in_app_path}"
+        else
+          puts "  \u0394  Creating directory: #{@in_app_path}"
+          Dir.mkdir(@in_app_path) unless @dry_run
+        end
+
+        results = load_and_parse_erb(template_file_path_and_name)
+
+        if File.exists?(@new_file_path_name)
+          puts "  X  File exists, SKIPPING: #{@new_file_path_name}"
+        else
+          puts "  \u0394  Creating file: #{@new_file_path_name}"
+          File.open(@new_file_path_name, 'w+') { |file| file.write(results) } unless @dry_run
+        end
+      end
+
+      puts "\n     Done"
+    end
+
+    def load_and_parse_erb(template_file_name_and_path)
+      template_file = File.open(template_file_name_and_path, 'r').read
+      erb = ERB.new(template_file)
+      erb.result(binding)
+    end
+  end
+end
+
+
+# Process input, execute actions
 unless ARGV.length > 0
-  puts 'RMQ - Invalid command, do something like this: rmq create my_new_app'
+  puts "RMQ - Invalid command, do something like this: rmq create my_new_app\n"
+  puts RmqCommandLine::HELP_TEXT
   exit
 end
 
-
 action = ARGV[0]
-value = ARGV[1]
 
 case action
 when 'create'
-  `motion create --template=git@github.com:infinitered/rmq-template.git #{value}`
-
-  puts %{
-Complete. Things you should do:
-> cd #{value}
-> bundle
-> rake spec
-> rake
-(main)> exit
-
-Then try these:
-> rake retina=3.5
-> rake retina=4 
-> rake device_family=ipad 
-> rake device }
-
+  RmqCommandLine.create(ARGV[1], ARGV[2], ARGV[3])
 when 'api'
   `open http://rdoc.info/github/infinitered/rmq`
 when 'docs'
   `open http://infinitered.com/rmq`
+when '--help', '-h'
+  puts RmqCommandLine::HELP_TEXT
+when '-v', '--version'
+  puts RubyMotionQuery::VERSION
 else
   puts 'RMQ - Invalid action'
-
+  puts RmqCommandLine::HELP_TEXT
 end

data/motion/ruby_motion_query/animations.rb

@@ -102,6 +102,35 @@ module RubyMotionQuery
       )
     end
 
+    def drop_and_spin(opts = {})
+      remove_view = opts[:remove_view]
+      opts.merge!({
+        duration: 0.4 + (rand(8) / 10),
+        options: UIViewAnimationOptionCurveEaseIn|UIViewAnimationOptionBeginFromCurrentState,
+        animations: -> (cq) {
+          cq.style do |st| 
+            st.top = @rmq.device.height + st.height
+            st.rotation = 180 + rand(50) 
+          end
+        },
+        completion: -> (did_finish, q) {
+          if did_finish
+            q.style do |st| 
+              st.rotation = 0
+            end
+
+            if remove_view
+              q.remove
+            else
+              q.hide.move(t:0)
+            end
+          end
+        }
+      })
+
+      @rmq.animate(opts)
+    end
+
     # @return [RMQ]
     def blink
       self.fade_out(duration: 0.2, after: lambda {|did_finish, rmq| rmq.animations.fade_in(duration: 0.2)})

data/motion/ruby_motion_query/base.rb

@@ -164,7 +164,8 @@ module RubyMotionQuery
 
     # Super useful in the console. log outputs to the console a table of the selected views
     #
-    # @param :wide outputs wide format (really wide, but awesome: rmq.all.log :wide)
+    # @param :wide outputs wide format (really wide, but awesome: rmq.all.log :wide). :tree outputs the 
+    # log in a tree form
     #
     # @return [String]
     #
@@ -193,7 +194,18 @@ module RubyMotionQuery
     #    168204512   | UIView                | 0                       |                                 |
     #    - - - - - - | - - - - - - - - - - - | - - - - - - - - - - - - | - - - - - - - - - - - - - - - - |
     #    RMQ 278442176. 6 selected. selectors: [UIImageView]#
+    #
+    # @example
+    #   rmq.log :tree
+    #
+    # @example
+    #   rmq.all.log :wide
     def log(opt = nil)
+      if opt == :tree
+        puts tree_to_s(selected) 
+        return
+      end
+
       wide = (opt == :wide)
       out =  "\n object_id   | class                 | style_name              | frame                           |"
       out << "\n" unless wide
@@ -234,9 +246,55 @@ module RubyMotionQuery
       puts out
     end
 
+    def tree_to_s(selected_views, depth = 0)
+      out = ""
+
+      selected_views.each do |view| 
+        first = (view == selected_views.first)
+        last = (view == selected_views.last)
+
+        if depth == 0
+          out << "\n"
+        else
+          0.upto(depth - 1).each do |i|
+            out << (i == (depth - 1) ? '    ├' : '    │')
+          end
+        end
+
+        out << '───'
+
+        out << " #{view.class.name[0..21]}"
+        out << "  ( #{view.rmq_data.style_name[0..23]} )" if view.rmq_data.style_name
+        out << "  #{view.object_id.to_s}"
+        out << "  [ #{view.rmq_data.tag_names.join(',')} ]" if view.rmq_data.tag_names.length > 0
+
+        if view.origin
+          format = '#0.#'
+          s = "  {l: #{RMQ.format.numeric(view.origin.x, format)}"
+          s << ", t: #{RMQ.format.numeric(view.origin.y, format)}"
+          s << ", w: #{RMQ.format.numeric(view.size.width, format)}"
+          s << ", h: #{RMQ.format.numeric(view.size.height, format)}}"
+          out << s
+        end
+
+        out << "\n"
+        out << tree_to_s(view.subviews, depth + 1)
+      end
+
+      out
+    end
+
     class << self
       attr_accessor :cache_controller_rmqs
       @cache_controller_rmqs = true
+
+      def debugging?
+        @debugging ||= ENV['rmq_debug'] == 'true'
+      end
+
+      def debugging=(flag)
+        @debugging = flag
+      end
     end
 
     protected 

data/motion/ruby_motion_query/device.rb

@@ -38,6 +38,10 @@ module RubyMotionQuery
         @_iphone
       end
 
+      def simulator?
+        @_simulator ||= !(UIDevice.currentDevice.model =~ /simulator/i).nil?
+      end
+
       def four_inch?
         @_four_inch = (Device.height == 568.0) if @_four_inch.nil?
         @_four_inch

data/motion/ruby_motion_query/position.rb

@@ -37,5 +37,20 @@ module RubyMotionQuery
       self
     end
 
+    # @return [Array] or [CGSize]
+    def location_in_root_view
+      self.location_in(self.root_view)
+    end
+
+    # @return [Array] or [CGSize]
+    def location_in(view)
+      out = []
+      selected.each do |selected_view|
+        out << selected_view.convertRect(selected_view.bounds, toView: view).origin
+      end
+      out = out.first if out.length == 1
+      out
+    end
+
   end
 end

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -245,6 +245,11 @@ module RubyMotionQuery
         end
       end
 
+      def rotation=(new_angle)
+        radians = new_angle * Math::PI / 180 
+        @view.transform = CGAffineTransformMakeRotation(radians)
+      end
+
     end
   end
 end

data/motion/ruby_motion_query/version.rb

@@ -0,0 +1,3 @@
+module RubyMotionQuery
+  VERSION = "0.4.0"
+end

data/templates/controller/app/controllers/name_controller.rb

@@ -0,0 +1,37 @@
+class <%= @name_camel_case %>Controller < UIViewController
+
+  def viewDidLoad
+    super
+
+    rmq.stylesheet = <%= @name_camel_case %>ControllerStylesheet
+    rmq(self.view).apply_style :root_view
+
+    # Create your views here
+  end
+
+  # Remove if you are only supporting portrait
+  def supportedInterfaceOrientations
+    UIInterfaceOrientationMaskAll
+  end
+
+  # Remove if you are only supporting portrait
+  def willAnimateRotationToInterfaceOrientation(orientation, duration: duration)
+    rmq.all.reapply_styles
+  end
+end
+
+
+__END__
+
+# You don't have to reapply styles to all UIViews, if you want to optimize, 
+# another way to do it is tag the views you need to restyle in your stylesheet, 
+# then only reapply the tagged views, like so:
+def logo(st)
+  st.frame = {t: 10, w: 200, h: 96}
+  st.centered = :horizontal
+  st.image = image.resource('logo')
+  st.tag(:reapply_style)
+end
+
+# Then in willAnimateRotationToInterfaceOrientation
+rmq(:reapply_style).reapply_styles

data/templates/controller/app/stylesheets/name_controller_stylesheet.rb

@@ -0,0 +1,11 @@
+class <%= @name_camel_case %>ControllerStylesheet < ApplicationStylesheet
+
+  def setup
+    # Add sytlesheet specific setup stuff here.
+    # Add application specific setup stuff in application_stylesheet.rb
+  end
+
+  def root_view(st)
+    st.background_color = color.white
+  end
+end

data/templates/controller/spec/controllers/name_controller.rb

@@ -0,0 +1,9 @@
+describe '<%= @name_camel_case %>Controller' do
+
+  before do
+  end
+
+  after do
+  end
+
+end

data/templates/lib/lib/name.rb

@@ -0,0 +1,4 @@
+class <%= @name_camel_case %>
+  def initialize
+  end
+end

data/templates/lib/spec/lib/name.rb

@@ -0,0 +1,9 @@
+describe '<%= @name_camel_case %>' do
+
+  before do
+  end
+
+  after do
+  end
+
+end

data/templates/model/app/models/name.rb

@@ -0,0 +1,30 @@
+class <%= @name_camel_case %>
+  def initialize(params = {})
+  end
+
+  def update(params = {})
+    self
+  end
+
+  def delete
+  end
+
+  def save
+    true
+  end
+
+  class << self
+    def create(params = {})
+      <%= @name_camel_case %>.new(params).tap do |<%= @name %>|
+        <%= @name %>.save
+      end
+    end
+
+    def find(id_or_params)
+    end
+
+    def all
+      <%= @name_camel_case %>.find(:all)
+    end
+  end
+end

data/templates/model/spec/models/name.rb

@@ -0,0 +1,12 @@
+describe '<%= @name_camel_case %>' do
+
+  before do
+  end
+
+  after do
+  end
+
+  it 'should create instance' do
+    <%= @name_camel_case %>.create.is_a?(<%= @name_camel_case %>).should == true
+  end
+end

data/templates/shared/app/shared/name.rb

@@ -0,0 +1,4 @@
+class <%= @name_camel_case %>
+  def initialize
+  end
+end

data/templates/shared/spec/shared/name.rb

@@ -0,0 +1,9 @@
+describe '<%= @name_camel_case %>' do
+
+  before do
+  end
+
+  after do
+  end
+
+end

data/templates/view/app/stylesheets/name_stylesheet.rb

@@ -0,0 +1,10 @@
+module <%= @name_camel_case %>Stylesheet
+
+  def <%= @name %>(st)
+    st.frame = {l: 5, t: 100, w: 80, h: 40}
+    st.background_color = color.light_gray
+
+    # Style overall view here
+  end
+
+end

data/templates/view/app/views/name.rb

@@ -0,0 +1,25 @@
+class <%= @name_camel_case %> < UIView
+
+  def rmq_did_create(self_in_rmq)
+
+    self_in_rmq.tap do |q|
+      q.apply_style :<%= @name %>
+
+      # Add subviews here, like so:
+      #q.append(UILabel, :some_label)
+    end
+
+  end
+
+end
+
+
+# To style this view include its stylesheet at the top of each controller's 
+# stylesheet that is going to use it:
+#   class SomeStylesheet < ApplicationStylesheet 
+#     include <%= @stylesheet_name %>
+
+# Another option is to use your controller's stylesheet to style this view. This
+# works well if only one controller uses it. If you do that, delete the 
+# view's stylesheet with:
+#   rm app/stylesheets/views/<%= @name %>.rb

data/templates/view/spec/views/name.rb

@@ -0,0 +1,9 @@
+describe '<%= @name_camel_case %>' do
+
+  before do
+  end
+
+  after do
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Todd Werth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -91,6 +91,19 @@ files:
 - motion/ruby_motion_query/tags.rb
 - motion/ruby_motion_query/traverse.rb
 - motion/ruby_motion_query/utils.rb
+- motion/ruby_motion_query/version.rb
+- templates/controller/app/controllers/name_controller.rb
+- templates/controller/app/stylesheets/name_controller_stylesheet.rb
+- templates/controller/spec/controllers/name_controller.rb
+- templates/lib/lib/name.rb
+- templates/lib/spec/lib/name.rb
+- templates/model/app/models/name.rb
+- templates/model/spec/models/name.rb
+- templates/shared/app/shared/name.rb
+- templates/shared/spec/shared/name.rb
+- templates/view/app/stylesheets/name_stylesheet.rb
+- templates/view/app/views/name.rb
+- templates/view/spec/views/name.rb
 - bin/rmq
 homepage: http://infinitered.com/rmq
 licenses: