zapata 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ed505b11c49d0937c21dd672d941ddbed166a7
-  data.tar.gz: 7d8b7e08e587db3711a7883d3b6401164547bde2
+  metadata.gz: a623cb9783f185bae4d4111b99219ce93a83539d
+  data.tar.gz: a0222512c8e1ca6c334641245a0bf82cab4adca5
 SHA512:
-  metadata.gz: 802d1b5d46141a0c76af5daa092d4b026b62032cc54b3df3137a2e00c0443dd218f04b68cc8e7a6d7935addbbd434f20aa46a20083815a2524244212e959dffc
-  data.tar.gz: af4f6ca0d3cae7de44de60b28dc77b0db1446f3925d32d25eb72280c347c806d06743de2315d9616885112a9766a8c7f9a30e65c82f3e573a39ca3aa3639f5a0
+  metadata.gz: 08172f430be1bdad603cb4200e8e8443e459b174e2b4b2958d514c4bca876837994264cbf11329a8e2b595f482c24621f94da4833c212c1da2c569c748db5504
+  data.tar.gz: 4f943051fd300cffcef499f29bcfd7936186dde850b5e130132f5418c06275c4ba8dd9e333b24fbfc0c1d96242aa991126c79dd504905e8e4f72c51439bfd0da

data/.travis.yml

@@ -1,12 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.0
+  - 2.1.2
   - 2.0.0
-  - 1.9.3
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-2
-  - ruby-head
-  - jruby-head
-  - ree
 script: bundle exec rspec --pattern "spec/*_spec.rb"
+gemfile: spec/support/rails_test_app/Gemfile

data/README.md

@@ -1,4 +1,6 @@
 [![Code Climate](https://codeclimate.com/github/Nedomas/zapata/badges/gpa.svg)](https://codeclimate.com/github/Nedomas/zapata)
+[![Gem Version](https://badge.fury.io/rb/zapata.svg)](http://badge.fury.io/rb/zapata)
+[![Build Status](https://travis-ci.org/Nedomas/zapata.svg?branch=master)](https://travis-ci.org/Nedomas/zapata)
 
 # Zapata
 
@@ -118,6 +120,11 @@ __To be more specific:__
 For more things it can currently do check
 https://github.com/Nedomas/zapata/tree/master/spec
 
+## Requirements
+
+- Ruby 2.0+
+- Rails 3.0+
+
 ## Installation
 
 It should be as easy as
@@ -131,16 +138,29 @@ or
 gem 'zapata', groups: %w(development test)
 ```
 
+## Usage
+
 To use run
 ```sh
 zapata generate app/models/model_name.rb
 ```
 
+To ignore other files and analyze a single model you want to generate a spec for:
+```sh
+zapata generate app/models/model_name.rb --single
+```
+
 ## Collaboration :heart:
 
-I know that code analyzing is a sexy sphere to work on for many developers.
-So here it is - a sexy project where you can realize your wet dreams about magic
-in Ruby.
+It is encouraged by somehow managing to bring a cake to your house. I promise,
+I will really try.
+
+This is a great project to understand language architecture in general. A
+project to let your free and expressionistic side shine through by leaving meta
+hacks and rainbows everywhere.
+
+Thank you to everyone who do. I strongly believe that this can make the
+developer job less robotic and more creative.
 
 To install, run:
 ```sh

data/lib/zapata/diver.rb

@@ -44,28 +44,33 @@ module Zapata
       end
 
       def dive(code)
-        unless code
-          return Primitive::Nil.new
+        return Primitive::Nil.new unless code
+        return Primitive::Raw.new(:missing, :hard_type) if HARD_TYPES.include?(code.type)
+
+        if (klass = primitive_klass(code))
+          result = klass.new(code)
+          DB.create(result) if search_for_types.include?(code.type)
         end
 
-        current_type = code.type
-        return Primitive::Raw.new(:missing, :hard_type) if HARD_TYPES.include?(current_type)
+        deeper_dives(code)
 
-        subklass_pair = PRIMITIVE_TYPES.detect do |_, types|
-          types.include?(current_type)
-        end
+        result || Primitive::Raw.new(:super, nil)
+      end
 
-        if subklass_pair
-          klass = "Zapata::Primitive::#{subklass_pair.first}".constantize
-          result = klass.new(code)
+      def primitive_klass(code)
+        primitive_type = find_primitive_type(code)
+        return unless primitive_type
 
-          DB.create(result) if search_for_types.include?(current_type)
-        else
-        end
+        "Zapata::Primitive::#{primitive_type}".constantize
+      end
 
-        deeper_dives(code) if DIVE_TYPES.include?(current_type)
+      def find_primitive_type(code)
+        klass_pair = PRIMITIVE_TYPES.detect do |_, types|
+          types.include?(code.type)
+        end
+        return unless klass_pair
 
-        result || Primitive::Raw.new(:super, nil)
+        klass_pair.first
       end
 
       def search_for_types
@@ -73,6 +78,8 @@ module Zapata
       end
 
       def deeper_dives(code)
+        return unless DIVE_TYPES.include?(code.type)
+
         code.to_a.compact.each do |part|
           dive(part)
         end

data/lib/zapata/primitive/arg.rb

@@ -9,7 +9,7 @@ module Zapata
 
       def to_raw
         chosen_value = Predictor::Value.new(node.name, self).choose.to_raw
-        return_with_super_as_missing(chosen_value, node.name)
+        return_with_super_as_missing(chosen_value, self)
       end
     end
   end

data/lib/zapata/primitive/array.rb

@@ -18,7 +18,7 @@ module Zapata
 
           if raw.type == :super
             predicted = Predictor::Value.new(raw.value).choose.to_raw
-            return_with_super_as_missing(predicted, primitive.name)
+            return_with_super_as_missing(predicted, primitive)
           else
             raw
           end

data/lib/zapata/primitive/base.rb

@@ -23,8 +23,8 @@ module Zapata
         Diver.dive(node.body).to_raw
       end
 
-      def return_with_super_as_missing(raw, name)
-        raw.type == :super ? Missing.new(name).to_raw : raw
+      def return_with_super_as_missing(raw, primitive)
+        raw.type == :super ? Missing.new(primitive.name).to_raw : raw
       end
 
       def return_with_missing_as_super(raw, name)

data/lib/zapata/primitive/send.rb

@@ -33,7 +33,8 @@ module Zapata
           ConstSend.new(raw_receiver, node.name, node.args).to_raw
         else
           raw = Predictor::Value.new(node.name, self).choose.to_raw
-          return_with_missing_as_super(raw, node.name)
+          missing_name = raw.type == :super ? Unparser.unparse(code) : node.name
+          Missing.new(missing_name).to_raw
         end
       end
     end

data/lib/zapata/version.rb

@@ -1,3 +1,3 @@
 module Zapata
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/spec_helper.rb

@@ -101,7 +101,13 @@ def exec_generation(generate_for)
   end
 
   output = stdout.readlines
-  generated_filename = output.last.match(/File\ (.+)\ was/)[1]
+  begin
+    generated_filename = output.last.match(/File\ (.+)\ was/)[1]
+  rescue
+    raise "Did not get the message that file was generated. Got this instead:
+      STDOUT: #{output}
+      STDERR: #{stderr.readlines}"
+  end
   spec_path = "#{RAILS_TEST_APP_DIR}/#{generated_filename}"
 
   clean(

data/spec/support/rails_test_app/Gemfile

@@ -30,7 +30,7 @@ end
 # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
 gem 'spring',        group: :development
 
-gem 'zapata', path: '~/Developer/zapata'
+gem 'zapata'
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'

data/spec/support/rails_test_app/Gemfile.lock

@@ -1,20 +1,3 @@
-PATH
-  remote: ~/Developer/zapata
-  specs:
-    zapata (0.0.2)
-      andand (~> 1.3)
-      file-temp (~> 1.2)
-      memoist
-      parser (~> 2.1)
-      pry (~> 0.9)
-      pry-stack_explorer (~> 0.4)
-      rails (>= 3.0.0)
-      require_all (~> 1.3)
-      rspec
-      rspec-rails
-      slop (~> 3.4)
-      unparser (~> 0.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -188,6 +171,19 @@ GEM
       equalizer (~> 0.0.9)
       parser (~> 2.1)
       procto (~> 0.0.2)
+    zapata (0.0.2)
+      andand (~> 1.3)
+      file-temp (~> 1.2)
+      memoist
+      parser (~> 2.1)
+      pry (~> 0.9)
+      pry-stack_explorer (~> 0.4)
+      rails (>= 3.0.0)
+      require_all (~> 1.3)
+      rspec
+      rspec-rails
+      slop (~> 3.4)
+      unparser (~> 0.1)
 
 PLATFORMS
   ruby
@@ -204,4 +200,4 @@ DEPENDENCIES
   sqlite3
   turbolinks
   uglifier (>= 1.3.0)
-  zapata!
+  zapata

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zapata
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Domas Bitvinskas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser