pg_gnostic 0.0.4 → 0.1.0

data/README.rdoc

@@ -12,15 +12,10 @@ and then
 
  sudo rake gems:install
 
-To install pg_gnostic rake tasks u need add this lines into  RAILS_ROOT/Rakefile
-
-  require 'pg_gnostic'
-  require 'pg_gnostic/tasks'
-
 == FEATURES
 
 * add pg views generator
-  scripts/generate pg_view [--format= ruby|sql] view_name [dependency_view_names]
+  rails generate pg_view [--format= ruby|sql] view_name [dependency_view_names]
 * rake pg: pg:drop_views, pg:functions, pg:views and all in one pg:update
 
 
@@ -28,7 +23,9 @@ To install pg_gnostic rake tasks u need add this lines into  RAILS_ROOT/Rakefile
 
 0.0.2  - backup/restore rakes
 0.0.3  - add PgGnostic::ViewDefinition#clear_declarations  method
-0.0.4  - Updated kung_figure dependency
+0.0.4  - kung_figure dependency updated
+0.0.5  - compatibility with Ruby 1.9
+0.1.0  - converted to Rails 3 format. No backward compatibility with Rails 2.x
 
 == TODO 
 

data/Rakefile

@@ -24,9 +24,9 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 
-PKG_FILES = FileList[ '[a-zA-Z]*', 'generators/**/*', 'lib/**/*', 'rails/**/*', 'tasks/**/*', 'test/**/*' ]
+PKG_FILES = FileList[ '[a-zA-Z]*', 'rails/generators/**/*', 'lib/**/*', 'rails/**/*', 'tasks/**/*', 'test/**/*' ]
 
-require 'lib/pg_gnostic'
+require File.join(File.dirname(__FILE__), 'lib/pg_gnostic')
 spec = Gem::Specification.new do |s|
   s.name = "pg_gnostic"
   s.version = PgGnostic::VERSION 
@@ -40,6 +40,8 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = false
   s.extra_rdoc_files = ["README.rdoc"]
   s.add_dependency('kung_figure')
+  s.add_dependency('rails', '>=3.0.0')
+  s.add_development_dependency('test-unit')
 end
 
 desc 'Turn this plugin into a gem.'

data/lib/pg_gnostic/railtie.rb

@@ -0,0 +1,13 @@
+require 'rails/railtie'
+
+module PgGnostic
+  class Railtie < Rails::Railtie
+    generators do
+      require File.expand_path(File.join(File.dirname(__FILE__), '../../rails/generators/pg_view/pg_view_generator'))
+    end
+
+    rake_tasks do
+      load File.expand_path(File.join(File.dirname(__FILE__),'../..','tasks','pg_gnostic_tasks.rake'))
+    end
+  end
+end

data/lib/pg_gnostic/view_definition.rb

@@ -56,7 +56,8 @@ module PgGnostic
           load f
         end
         Dir["#{path}/*.sql"].each do |f|
-          sql = IO.readlines(f,'').to_s
+          lines = [IO.readlines(f, '')].flatten
+          sql = lines.join
           view_name = File.basename(f,".sql").to_sym
           create_view(view_name,:sql=>sql)
         end

data/lib/pg_gnostic.rb

@@ -3,12 +3,14 @@ $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname
 require 'kung_figure'
 # PgGnostic
 module PgGnostic
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
   include KungFigure
 
   autoload :ViewDefinition, 'pg_gnostic/view_definition'
   autoload :Config, 'pg_gnostic/config'
 
+  require 'pg_gnostic/railtie'
+
   class << self
     def define
       yield ViewDefinition

data/rails/generators/pg_view/USAGE

@@ -0,0 +1,5 @@
+Description:
+  Generate pg view file
+
+Example:
+  rails generate pg_view users

data/rails/generators/pg_view/pg_view_generator.rb

@@ -0,0 +1,34 @@
+require 'pg_gnostic'
+
+class PgViewGenerator < Rails::Generators::Base
+  desc "Generates pg view file"
+  class_option :format, :default => 'ruby', :aliases => "-f", :banner => 'sql | ruby'
+  argument :view_name, :required => true, :banner => "view name"
+  argument :dependencies, :type => :array, :required => false, :banner => "depends on views"
+  source_root File.dirname(__FILE__)
+
+  attr_reader :nest_in_module, :class_name, :dependencies, :prefix_view_name
+
+  def init_parameters
+    @view_name        = self.view_name
+    @model_name       = @view_name.singularize
+    @model_file_name  = @model_name.underscore
+    @class_name       = @model_name.classify
+    @dependencies     = self.dependencies
+    @nest_in_module   = PgGnostic.config.view_model.nest_in_module
+    @prefix_view_name = PgGnostic.config.view_model.prefix_view_name
+  end
+
+  def generate
+    model_path = PgGnostic.config.view_model.model_path
+    empty_directory 'db/views'
+    empty_directory model_path
+    case options[:format]
+      when 'sql'
+        template "templates/view.sql", File.join('db/views', "#{@view_name}.sql")
+      when 'ruby'
+        template "templates/view.rb", File.join('db/views', "#{@view_name}.rb")
+    end
+    template "templates/model.rb", File.join(model_path, "#{@model_file_name}.rb")
+  end
+end

data/test/config_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
 class PgGnosticViewUtilsTest < ActiveSupport::TestCase
   def test_default_config

data/test/db/schema.rb

@@ -1,13 +1,13 @@
 ActiveRecord::Schema.define(:version => 0) do
   create_table :users do |t|
-    t.string   :last_name,                 :limit => 25
-    t.string   :first_name,                :limit => 25
-    t.string   :middle_name,               :limit => 25
-    t.string   :name,                      :limit => 25
-    t.string   :login,                     :limit => 40
-    t.string   :email,                     :limit => 100
-    t.string   :crypted_password,          :limit => 40
-    t.string   :salt,                      :limit => 40
+    t.string :last_name, :limit => 25
+    t.string :first_name, :limit => 25
+    t.string :middle_name, :limit => 25
+    t.string :name, :limit => 25
+    t.string :login, :limit => 40
+    t.string :email, :limit => 100
+    t.string :crypted_password, :limit => 40
+    t.string :salt, :limit => 40
     t.datetime :last_login_datetime
     t.datetime :deleted_at
     t.timestamps

data/test/db/views/users.rb

@@ -1,8 +1,8 @@
 PgGnostic.define do |d|
-  d.named_fields :my_exclude_fields,'crypted_password','salt','last_login_datetime','deleted_at'
   d.create_view :view_users,:depends_on=>[:other_users], :sql=><<-SQL
   SELECT
-  <%= users.* :exclude=>[timestamps,'id',my_exclude_fields] %>
+    name, first_name, last_name
   FROM users
   SQL
 end
+# vim:ft=sql

data/test/pg_gnostic_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
 class PgGnosticTest < ActiveSupport::TestCase
   # Replace this with your real tests.

data/test/test_helper.rb

@@ -1,31 +1,26 @@
 require 'rubygems'
 require 'kung_figure'
+
 def path(path)
-  File.join(File.dirname(__FILE__),path)
+  File.join(File.dirname(__FILE__), path).to_s
 end
 
 $:.unshift(path('../lib'))
+require "test/unit"
 require 'pg_gnostic'
 require 'active_support'
 require 'active_support/test_case'
-require "rails_generator"
 require "active_record"
-require 'rails_generator/scripts/generate'
-require "test/unit"
+require 'rails'
+require "rails/generators"
 
+#Test::Unit.run = true
 
 GEM_ROOT= path('..')
-Rails::Generator::Base.default_options :collision => :ask, :quiet => false
-Rails::Generator::Base.reset_sources
-Rails::Generator::Base.append_sources(Rails::Generator::PathSource.new(:plugin, "#{GEM_ROOT}/generators/"))
 
 class GeneratorTest < ActiveSupport::TestCase
-  def generate(*args)
-    Rails::Generator::Scripts::Generate.new.run(args, :destination=>fake_rails_root)
-  end
-
   def read(path)
-    IO.readlines("#{fake_rails_root}/#{path}",'').to_s
+    [IO.readlines("#{fake_rails_root}/#{path}", '')].flatten.join
   end
 
   def assert_file(file)
@@ -92,4 +87,4 @@ class TestDbUtils
       ActiveRecord::Base.connection.drop_database config[:database]
     end
   end
-end
+end

data/test/view_definition_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 #ActiveRecord::Base.logger=Logger.new(STDOUT)
 
 TestDbUtils.ensure_schema
@@ -39,8 +39,6 @@ class PgGnosticViewUtilsTest < ActiveSupport::TestCase
     assert_contain_field(OtherUser,'name')
     assert_not_contain_field(OtherUser,'id')
     assert_not_contain_field(OtherUser,'created_at')
-    assert_not_contain_field(OtherUser,'crypted_password')
-    assert_not_contain_field(OtherUser,'deleted_at')
   end
 
   def test_clear_definitions

data/test/view_generator_test.rb

@@ -1,43 +1,48 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), "../rails/generators/pg_view/pg_view_generator"))
 
-class PgGnosticViewsGeneratorTest < GeneratorTest 
+class PgGnosticViewsGeneratorTest < GeneratorTest
   def test_generates_definition
-    PgGnostic.clear_config!
-    generate 'pg_view','users','roles'
-    assert_file 'db/views/users.rb'
-    result = read 'db/views/users.rb'
-    assert_match(/view_users/, result)
-    assert_match(/view_roles/, result)
-    assert_match(/PgGnostic.define/, result)
-    assert_match(/depends_on/, result)
-    assert_file 'app/model/views/user.rb'
-    result = read 'app/model/views/user.rb'
-    assert_match(/class User < ActiveRecord::Base/, result)
+    FileUtils.chdir fake_rails_root do
+      PgGnostic.clear_config!
+      PgViewGenerator.new(['users', 'roles']).invoke_all
+      assert_file 'db/views/users.rb'
+      result = read 'db/views/users.rb'
+      assert_match(/view_users/, result)
+      assert_match(/view_roles/, result)
+      assert_match(/PgGnostic.define/, result)
+      assert_match(/depends_on/, result)
+      assert_file 'app/model/views/user.rb'
+      result = read 'app/model/views/user.rb'
+      assert_match(/class User < ActiveRecord::Base/, result)
 
-    generate 'pg_view','roles','--format','sql'
-    assert_file 'db/views/roles.sql'
-    result = read 'db/views/roles.sql'
-    assert_file 'app/model/views/role.rb'
-    result = read 'app/model/views/role.rb'
-    assert_match(/class Role < ActiveRecord::Base/, result)
+      PgViewGenerator.new(['roles'], {:format => 'sql'}).invoke_all
+      assert_file 'db/views/roles.sql'
+      result = read 'db/views/roles.sql'
+      assert_file 'app/model/views/role.rb'
+      result = read 'app/model/views/role.rb'
+      assert_match(/class Role < ActiveRecord::Base/, result)
+    end
   end
 
   def test_gen_with_changed_config
-    PgGnostic.clear_config!
-    PgGnostic.config.view_model.nest_in_module 'PgViews'
-    generate 'pg_view','users','roles'
-    assert_file 'app/model/pg_views/user.rb'
-    result = read 'app/model/pg_views/user.rb'
-    assert_match(/module PgViews/, result)
+    FileUtils.chdir fake_rails_root do
+      PgGnostic.clear_config!
+      PgGnostic.config.view_model.nest_in_module 'PgViews'
+      PgViewGenerator.new(['users', 'roles']).invoke_all
+      assert_file 'app/model/pg_views/user.rb'
+      result = read 'app/model/pg_views/user.rb'
+      assert_match(/module PgViews/, result)
 
-    PgGnostic.configure do
-      view_model do
-        nest_in_module ''
+      PgGnostic.configure do
+        view_model do
+          nest_in_module ''
+        end
       end
+      PgViewGenerator.new(['users', 'roles']).invoke_all
+      assert_file 'app/model/user.rb'
+      result = read 'app/model/user.rb'
+      assert_no_match(/module/, result)
     end
-    generate 'pg_view','users','roles'
-    assert_file 'app/model/user.rb'
-    result = read 'app/model/user.rb'
-    assert_no_match(/module/, result)
   end
-end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: pg_gnostic
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - niquola
@@ -9,19 +14,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +04:00
+date: 2010-11-18 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: kung_figure
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: 
 email: niquola@gmail.com
 executables: []
@@ -34,13 +70,13 @@ files:
 - README.rdoc
 - Rakefile
 - MIT-LICENSE
-- generators/pg_view/USAGE
-- generators/pg_view/pg_view_generator.rb
-- generators/pg_view/templates/model.rb
-- generators/pg_view/templates/view.sql
-- generators/pg_view/templates/view.rb
+- rails/generators/pg_view/USAGE
+- rails/generators/pg_view/pg_view_generator.rb
+- rails/generators/pg_view/templates/model.rb
+- rails/generators/pg_view/templates/view.sql
+- rails/generators/pg_view/templates/view.rb
+- lib/pg_gnostic/railtie.rb
 - lib/pg_gnostic/config.rb
-- lib/pg_gnostic/tasks.rb
 - lib/pg_gnostic/view_definition.rb
 - lib/pg_gnostic.rb
 - tasks/pg_gnostic_tasks.rake
@@ -67,21 +103,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails plugin for postgres

data/generators/pg_view/USAGE

@@ -1,5 +0,0 @@
-Description:
-  Generate pg view file
-
-Modules Example:
-    `./script/generate pg_view users

data/generators/pg_view/pg_view_generator.rb

@@ -1,50 +0,0 @@
-$:.unshift(path('../lib'))
-require 'pg_gnostic'
-class PgViewGenerator < Rails::Generator::Base
-  default_options :format => 'ruby'
-  def manifest
-    record do |m|
-      unless args.size > 0
-        puts "require view name"
-        exit 1
-      end
-      parse_args
-      model_path = PgGnostic.config.view_model.model_path
-      m.directory  File.join('db/views')
-      m.directory  File.join(model_path)
-      case options[:format]
-      when 'sql':
-        m.template "view.sql", File.join('db/views',"#{@view_name}.sql"), :assigns=>@assigns 
-      when 'ruby':
-        m.template "view.rb", File.join('db/views',"#{@view_name}.rb"), :assigns=>@assigns
-      end
-      m.template "model.rb", File.join(model_path,"#{@model_file_name}.rb"), :assigns=>@assigns
-    end
-  end
-
-  def parse_args
-    @view_name = args.shift.pluralize
-    @model_name = @view_name.singularize
-    @model_file_name = @model_name.underscore
-    @class_name = @model_name.classify
-    @dependencies = args if args.length > 0
-    @assigns = {
-      :view_name=>@view_name,
-      :class_name=>@class_name,
-      :dependencies=>@dependencies, 
-      :nest_in_module=>PgGnostic.config.view_model.nest_in_module,
-      :prefix_view_name=>PgGnostic.config.view_model.prefix_view_name
-    }
-  end
-
-  protected
-  def banner
-    "Usage: #{$0} #{spec.name} ViewName"
-  end
-
-  def add_options!(opt)
-    opt.separator ''
-    opt.separator 'Options:'
-    opt.on("-f","--format=ruby", String, "sql | ruby","Default ruby") { |v| options[:format] = v }
-  end
-end

data/lib/pg_gnostic/tasks.rb

@@ -1 +0,0 @@
-load File.join(File.dirname(__FILE__),'../..','tasks','pg_gnostic_tasks.rake')