posgra 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 779439047ffa052724a0188fddd2d07291d632be
-  data.tar.gz: dc13051ea5f743c90bb03f17e8552b8042403804
+  metadata.gz: a9ee6f48faa2e876c6077d8fa8470ea2c923cb15
+  data.tar.gz: d178b484899df16095545fbacabd944807c4472b
 SHA512:
-  metadata.gz: 969080594fab8c8fd0f4b99d7c7188ab52e15e9147a51caf55c41df74bc9485245460439639cde467e3f7fa491eca91382630e5983b9f884af162b5e877f44dd
-  data.tar.gz: 685cbe3e19daba11a16d2f4852ccab18794c4eebb8c183128ee0428e557a34d66f0b91ddb724bad9bc173aadd90dcdf0293fd7f154a88dbb1b9e3ba6afea4d88
+  metadata.gz: 47e4b6b06a85789e5144b42bd977c28f7cca36876c6b56c384ed46e317705b70557dac3461d0393cd0a5cd01e0142f7274858b3f93965420257b19164a7983a8
+  data.tar.gz: 91f3f70b90c9c449d3be4b2eeff6a98c51a70a73d44027ab0588d6d75459b0d6beb5f722d9484695ab5205f4cce50ef5bab9580df8bb3afabd920fb7f402f89d

data/README.md

@@ -87,7 +87,7 @@ role "bob" do
       grant "TRUNCATE"
       grant "UPDATE"
     end
-    on "microposts_id_seq" do
+    on "microposts_id_seq", expired: '2014/10/07' do
       grant "SELECT"
       grant "UPDATE"
     end
@@ -97,3 +97,36 @@ role "bob" do
   end
 end
 ```
+
+### Template
+
+```ruby
+template "all grants" do
+  on context.object do
+    grant "DELETE", grantable: true
+    grant "INSERT"
+    grant "REFERENCES"
+    grant "SELECT"
+    grant "TRIGGER"
+    grant "TRUNCATE"
+    grant "UPDATE"
+  end
+end
+
+template "grant select" do
+  grant "SELECT"
+end
+
+role "bob" do
+  schema "main" do
+    include_template "all grants", object: "microposts"
+    on "microposts_id_seq", expired: '2014/10/07' do
+      grant "SELECT"
+      grant "UPDATE"
+    end
+    on /^user/ do
+      include_template "grant select"
+    end
+  end
+end
+```

data/lib/posgra.rb

@@ -3,6 +3,7 @@ require 'logger'
 require 'pg'
 require 'singleton'
 require 'term/ansicolor'
+require 'time'
 require 'thor'
 
 module Posgra; end

data/lib/posgra/driver.rb

@@ -12,6 +12,7 @@ class Posgra::Driver
     'D' => 'TRUNCATE',
     'x' => 'REFERENCES',
     't' => 'TRIGGER',
+    'U' => 'USAGE',
   }
 
   def initialize(client, options = {})
@@ -335,12 +336,12 @@ class Posgra::Driver
 
   def expand_privileges(privileges)
     options_by_privilege = {}
-
+p
     privileges.scan(/([a-z])(\*)?/i).each do |privilege_type_char,is_grantable|
       privilege_type = PRIVILEGE_TYPES[privilege_type_char]
 
       unless privilege_type
-        log(:warn, "unknown privilege type: #{privilege_type_char}", :color => :yellow)
+        log(:warn, "Unknown privilege type: #{privilege_type_char}", :color => :yellow)
         next
       end
 

data/lib/posgra/dsl/grants/role/schema.rb

@@ -12,11 +12,20 @@ class Posgra::DSL::Grants::Role::Schema
     instance_eval(&block)
   end
 
-  def on(name, &block)
+  def on(name, options = {}, &block)
     unless name.is_a?(Regexp)
       name = name.to_s
     end
 
+    if options[:expired]
+      expired = Time.parse(options[:expired])
+
+      if Time.new >= expired
+        log(:warn, "Privilege for `#{name}` has expired", :color => :yellow)
+        return
+      end
+    end
+
     @result[name] = Posgra::DSL::Grants::Role::Schema::On.new(@context, name, @options, &block).result
   end
 end

data/lib/posgra/version.rb

@@ -1,3 +1,3 @@
 module Posgra
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/posgra.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'unindent'
+  spec.add_development_dependency 'timecop'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: posgra
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - winebarrel
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Posgra is a tool to manage PostgreSQL roles/permissions.
 email:
 - sgwr_dts@yahoo.co.jp