napa 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c303631113443a38699bded25a0f869222f86a
-  data.tar.gz: 33c810492456288eba6f4e0bfc041db253fa8aef
+  metadata.gz: 2718b1367fa6291f248a6355cbd7805307d605ef
+  data.tar.gz: 66b0551ef54b97b7d73d5bcbd1521254f35df2b9
 SHA512:
-  metadata.gz: 3b7bb38860e58f64c4909d5647bb4f3d3ade3fb6f685cd3f0fdbdad72573018d316992068fd346b06d274e8bd3f7d872a6af364348efa699de66932f126c4a5c
-  data.tar.gz: 0c85828fa6035881434a92aa4d43d29103476d620233cab74ef951f68e1b3605b9e5cf9b4710a92a9c735f2153d8996f021d4db612f3a9d189182c33f372d50f
+  metadata.gz: 8270a158da3bcc9fb032ff5f32efaef70c470d43580cdd11e37e77c812e2e29ee55a3ff4300c2652df3e4b96d0cd2c6f7763e43684f9d528546555f0b519ab3c
+  data.tar.gz: 33596208d45629e9fc4498c28cb3d5d25a2802a26ebec8ca1c19a4e44c10639ede89909e4298c7efa787fc927c9aaeed88415b048c2e916fe1ec45cb6b66bac0

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 master
 ===
 
+0.2.1
+===
+* Updated Napa console. It now takes an optional environment parameter, i.e. `napa console production`.
+* Added `c` alias for Napa console, i.e. `napa c` or `napa c production`
+* Fixed a bug causing `rake db:schema:load` to fail
+* Fixed a bug affecting `rake db:create` and `rake db:drop` using Postgres
+* Fixed a bug Napa::GrapeHelpers to bypass the representer when given an array
+
 0.2.0
 ===
 * The console is now run with `napa console`, added support for racksh

data/lib/napa/active_record_extensions/stats.rb

@@ -16,22 +16,26 @@ if defined?(ActiveSupport)
         [m[:table], 'SELECT']
       end
 
-      def self.guess_sql_content(query)
+      def self.extract_sql_updates(query)
         m = query.match(SQL_UPDATE_REGEXP)
-        return [m[:table], 'UPDATE'] if m
-        unless m
-          m = query.match(SQL_SELECT_REGEXP)
-          extract_sql_selects(query) if m
+        [m[:table], 'UPDATE']
+      end
+
+      def self.extract_sql_content(query)
+        table = action = nil
+        if query.match(SQL_UPDATE_REGEXP)
+          table, action = extract_sql_updates(query)
+        elsif query.match(SQL_SELECT_REGEXP)
+          table, action =  extract_sql_selects(query)
+        elsif query.match(SQL_INSERT_DELETE_PARSER_REGEXP)
+          table, action =  extract_from_sql_inserts_deletes(query)
         end
+        [table, action]
       end
 
       ActiveSupport::Notifications.subscribe 'sql.active_record' do |name, start, finish, id, payload|
-        if payload[:name] == 'SQL'
-          table, action = extract_from_sql_inserts_deletes(payload[:sql])
-        elsif payload[:name] =~ /.* Load$/
-          table, action = extract_sql_selects(payload[:sql])
-        elsif !payload[:name]
-          table, action = guess_sql_content(payload[:sql])
+        if payload[:sql].match(/(select|update|insert|delete)(.+)/i)
+          table, action = extract_sql_content(payload[:sql])
         end
 
         if table
@@ -43,4 +47,4 @@ if defined?(ActiveSupport)
       end
     end
   end
-end
+end

data/lib/napa/cli.rb

@@ -28,8 +28,11 @@ module Napa
         say Napa::VERSION
       end
 
-      desc 'console', 'Start the Napa console'
-      def console
+      desc 'console [environment]', 'Start the Napa console'
+      options aliases: 'c'
+      def console(environment = 'development' )
+        ENV['RACK_ENV'] = environment
+
         require 'racksh/init'
 
         begin

data/lib/napa/grape_extensions/grape_helpers.rb

@@ -4,7 +4,7 @@ module Napa
       raise ArgumentError.new(":with option is required") if with.nil?
 
       if data.respond_to?(:to_a)
-        return { data: data.each{ |item| with.new(item).to_hash(args) } }
+        return { data: data.map{ |item| with.new(item).to_hash(args) } }
       else
         return { data: with.new(data).to_hash(args)}
       end

data/lib/napa/version.rb

@@ -1,5 +1,5 @@
 module Napa
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 
   class Version
     class << self

data/lib/tasks/db.rake

@@ -19,7 +19,7 @@ unless defined?(Rails)
 
       options = {}.tap do |o|
         o[:adapter]                 = db['adapter']
-        o[:database]                = 'postgres' if db['adapter'] == 'postgres'
+        o[:database]                = 'postgres' if db['adapter'] == 'postgresql'
       end
 
       ActiveRecord::Base.establish_connection(options)
@@ -33,7 +33,7 @@ unless defined?(Rails)
 
       options = {}.tap do |o|
         o[:adapter]                 = db['adapter']
-        o[:database]                = 'postgres' if db['adapter'] == 'postgres'
+        o[:database]                = 'postgres' if db['adapter'] == 'postgresql'
       end
 
       ActiveRecord::Base.establish_connection(options)
@@ -59,6 +59,9 @@ unless defined?(Rails)
       desc "Load a schema.rb file into the database"
       task :load => :environment do
         file = ENV['SCHEMA'] || "db/schema.rb"
+        db = YAML.load(ERB.new(File.read('./config/database.yml')).result)[Napa.env]
+        ActiveRecord::Base.establish_connection(db)
+        ActiveRecord::Schema.verbose = true
         load(file)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: napa
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Darby Frey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake