post_json 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba717a41c7ab9e983103b70305d09b301e8c1130
-  data.tar.gz: 564e3a2eee9880edde739632a7223f7d571f78a6
+  metadata.gz: d5fb855c51537275da0a59cfda2e1b80bc13a257
+  data.tar.gz: 4088ddc01020461837ff1b1bfd044c5c1426ed33
 SHA512:
-  metadata.gz: 96775c8330a18731ec8ba1b56c7c30a1287a8824c50d9deae8e85f877638ed17c107d26a88f2a22876bcf36e157d499ec9138dccc6f5f3acdc4ca54769bf9f29
-  data.tar.gz: af55ee745807c8c1246651a319ec9978e4dc266fd84460840f5c79a14d240afc04543c57da37ad97af00d55205e88094b317171d3dca077d2cac155971e34403
+  metadata.gz: e5ce9111121f57bd4cbe74ec3bf9ba43704469bbc585abcc004894d47b243749a39cab7744de50d5b389e79c1013116258f418cc53efe5db1054aeb13ca0cad9
+  data.tar.gz: 6f27d38837491b0cbb3c5e4acf410c52066bdc6f4dbbed8893aae6886b5c22a401497ed8a7cb2cefb79da705fda3244446e84fc65c7fd2635bbca4d69c902793

data/README.md

@@ -71,11 +71,14 @@ Also, __notice you don't have to define model attributes anywhere!__
     
         also_me_1 = Person.where(details: {age: 33}).first
         also_me_2 = Person.where("details.age" => 33).first
-        also_me_3 = Person.where("json_details.age = ?", 33).first
+        also_me_3 = Person.where("function(doc) { return doc.details.age == 33; }").first
+        also_me_4 = Person.where("json_details.age = ?", 33).first
         
    PostJson support filtering on nested attributes as you can see. The two first queries speak for themself.
    
-   The third (and last) query is special and show it is possible to write real SQL queries. We just need to prefix 
+   The third query is special and show it is possible to use a pure JavaScript function for selecting documents.
+
+   The last query is also special and show it is possible to write real SQL queries. We just need to prefix 
    the JSON attributes with `json_`.
 
 4. Accessing attributes:

data/lib/generators/post_json/install/templates/create_procedures.rb

@@ -1,7 +1,4 @@
 # http://pgxn.org/dist/plv8/doc/plv8.html
-# http://plv8-pgopen.herokuapp.com/
-# http://www.craigkerstiens.com/2013/06/25/javascript-functions-for-postgres/
-# http://www.postgresonline.com/journal/archives/272-Using-PLV8-to-build-JSON-selectors.html
 
 class CreateProcedures < ActiveRecord::Migration
   def change
@@ -11,8 +8,7 @@ class CreateProcedures < ActiveRecord::Migration
     ActiveRecord::Base.connection.execute(json_selector_procedure)
     ActiveRecord::Base.connection.execute(json_selectors_procedure)
     ActiveRecord::Base.connection.execute(show_all_indexes_procedure)
-    # ActiveRecord::Base.connection.execute(show_indexes_procedure)
-    # ActiveRecord::Base.connection.execute(ensure_dynamic_index_procedure)
+    ActiveRecord::Base.connection.execute(show_indexes_procedure)
   end
 
   def json_numeric_procedure
@@ -79,42 +75,17 @@ $$ LANGUAGE plv8 IMMUTABLE STRICT;"
     $$ LANGUAGE plv8 IMMUTABLE STRICT;"
   end
 
-#   def show_indexes_procedure
-# "CREATE OR REPLACE FUNCTION show_indexes(table_name text DEFAULT '', index_prefix text DEFAULT '') RETURNS json AS $$
-#   var show_all_indexes = plv8.find_function('show_all_indexes');
-#   var indexes = show_all_indexes();
-#   if (0 < (table_name || '').length) {
-#     indexes = indexes.filter(function(row) { return row['table'] === table_name; });
-#   }
-#   if (0 < (index_prefix || '').length) {
-#     indexes = indexes.filter(function(row) { return row['index'].lastIndexOf(index_prefix, 0) === 0; });
-#   }
-#   return indexes;
-# $$ LANGUAGE plv8 IMMUTABLE STRICT;"
-#   end
-
-#   def ensure_dynamic_index_procedure
-#     raise ArgumentError, "index name should be: dyn_col_id_md5_hash_of_selector and truncated to a length of 63"
-#     raise ArgumentError, "it should only create 1 index and not multiple"
-
-
-#     # CREATE INDEX CONCURRENTLY post_json_documents_body_age ON post_json_documents(json_selector('age', body))
-# "CREATE OR REPLACE FUNCTION ensure_dynamic_index(selectors text, collection_id text) RETURNS json AS $$
-#   var show_indexes = plv8.find_function('show_indexes');
-#   var colId = collection_id.replace('-', '');
-#   var indexPrefix = 'col_' + colId + '_';
-#   var existingIndexes = show_indexes('post_json_documents', indexPrefix).map(function(row) { return row.index; });
-#   var selectorArray = selectors.replace(/\s+/g, '').split(',');
-
-#   var indexes = selectorArray.map(function(selector) { return {'name': indexPrefix + selector.replace('.', '_'), selector: selector}; });
-#   var newIndexes = indexes.filter(function(index) { return existingIndexes.indexOf(index.name) == -1; });
-
-#   newIndexes.forEach(function(index) {
-#     var sql = \"CREATE INDEX \" + index.name + \" ON post_json_documents(json_selector('\" + index.selector + \"', body)) WHERE collection_id = '\" + colId + \"';\"
-#     plv8.execute( sql );      
-#   });
-
-#   return newIndexes;
-# $$ LANGUAGE plv8 IMMUTABLE STRICT;"
-#   end
+  def show_indexes_procedure
+"CREATE OR REPLACE FUNCTION show_indexes(table_name text DEFAULT '', index_prefix text DEFAULT '') RETURNS json AS $$
+  var show_all_indexes = plv8.find_function('show_all_indexes');
+  var indexes = show_all_indexes();
+  if (0 < (table_name || '').length) {
+    indexes = indexes.filter(function(row) { return row['table'] === table_name; });
+  }
+  if (0 < (index_prefix || '').length) {
+    indexes = indexes.filter(function(row) { return row['index'].lastIndexOf(index_prefix, 0) === 0; });
+  }
+  return indexes;
+$$ LANGUAGE plv8 IMMUTABLE STRICT;"
+  end
 end

data/lib/generators/post_json/install/templates/enable_extensions.rb

@@ -1,28 +1,7 @@
 class EnableExtensions < ActiveRecord::Migration
   def change
-    # Install Postgresql 9.2 with PLV8 (might require )
-    # 1. sudo add-apt-repository ppa:pitti/postgresql 
-    # 2. sudo apt-get update
-    # 3. sudo apt-get install postgresql-9.2 postgresql-contrib-9.2 postgresql-server-dev-9.2 libv8-dev
-    # 4. sudo su - postgres
-    # 5. Enter psql and run "CREATE USER webnuts WITH PASSWORD 'webnuts';" and "ALTER USER webnuts CREATEDB;" and "ALTER USER webnuts SUPERUSER;"
-    # 6. git clone https://code.google.com/p/plv8js/
-    # 7. cd plv8js
-    # 8. make
-    # 9. sudo make install
-
-    # bundle exec rake db:create:all
-    # bundle exec rake db:migrate
-    # bundle exec rake db:test:prepare
-
-    # See all available extensions:
-    # ActiveRecord::Base.connection.execute("select * from pg_available_extensions;").each_row do |row|
-    #   puts row.to_s
-    # end
-
     enable_extension 'uuid-ossp'  # generate universally unique identifiers (UUIDs)
     enable_extension 'hstore'     # data type for storing sets of (key, value) pairs
     enable_extension 'plv8'       # PL/JavaScript (v8) trusted procedural language
-    #enable_extension 'plcoffee'   # PL/CoffeeScript (v8) trusted procedural language
   end
 end

data/lib/post_json/version.rb

@@ -1,3 +1,3 @@
 module PostJson
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/dummy/config/initializers/post_json.rb

@@ -1,5 +1,9 @@
-# Collection are identified by their name, so you can change the other attributes and they will be updated at application startup,
-# if you keep the same name
-#
-
-# PostJson::Collection.create_or_update([{name: "Customers", use_timestamps: false}, {name: "Orders/", use_version_number: false}])
+# PostJson.setup "people" do |collection|
+#   collection.record_timestamps = true                           # default is 'true'
+#   collection.created_at_attribute_name = "created_at"           # default is 'created_at'
+#   collection.updated_at_attribute_name = "updated_at"           # default is 'updated_at'
+#   collection.include_version_number = true                      # default is 'true'
+#   collection.version_attribute_name = "version"                 # default is 'version'
+#   collection.use_dynamic_index = true                           # default is 'true'
+#   collection.create_dynamic_index_milliseconds_threshold = 50   # default is '50'
+# end

data/spec/dummy/db/migrate/20131018135639_enable_extensions.rb

@@ -0,0 +1,7 @@
+class EnableExtensions < ActiveRecord::Migration
+  def change
+    enable_extension 'uuid-ossp'  # generate universally unique identifiers (UUIDs)
+    enable_extension 'hstore'     # data type for storing sets of (key, value) pairs
+    enable_extension 'plv8'       # PL/JavaScript (v8) trusted procedural language
+  end
+end

data/spec/dummy/db/migrate/{20131015022030_create_procedures.rb → 20131018135640_create_procedures.rb}

@@ -1,7 +1,4 @@
 # http://pgxn.org/dist/plv8/doc/plv8.html
-# http://plv8-pgopen.herokuapp.com/
-# http://www.craigkerstiens.com/2013/06/25/javascript-functions-for-postgres/
-# http://www.postgresonline.com/journal/archives/272-Using-PLV8-to-build-JSON-selectors.html
 
 class CreateProcedures < ActiveRecord::Migration
   def change
@@ -11,8 +8,7 @@ class CreateProcedures < ActiveRecord::Migration
     ActiveRecord::Base.connection.execute(json_selector_procedure)
     ActiveRecord::Base.connection.execute(json_selectors_procedure)
     ActiveRecord::Base.connection.execute(show_all_indexes_procedure)
-    # ActiveRecord::Base.connection.execute(show_indexes_procedure)
-    # ActiveRecord::Base.connection.execute(ensure_dynamic_index_procedure)
+    ActiveRecord::Base.connection.execute(show_indexes_procedure)
   end
 
   def json_numeric_procedure
@@ -79,42 +75,17 @@ $$ LANGUAGE plv8 IMMUTABLE STRICT;"
     $$ LANGUAGE plv8 IMMUTABLE STRICT;"
   end
 
-#   def show_indexes_procedure
-# "CREATE OR REPLACE FUNCTION show_indexes(table_name text DEFAULT '', index_prefix text DEFAULT '') RETURNS json AS $$
-#   var show_all_indexes = plv8.find_function('show_all_indexes');
-#   var indexes = show_all_indexes();
-#   if (0 < (table_name || '').length) {
-#     indexes = indexes.filter(function(row) { return row['table'] === table_name; });
-#   }
-#   if (0 < (index_prefix || '').length) {
-#     indexes = indexes.filter(function(row) { return row['index'].lastIndexOf(index_prefix, 0) === 0; });
-#   }
-#   return indexes;
-# $$ LANGUAGE plv8 IMMUTABLE STRICT;"
-#   end
-
-#   def ensure_dynamic_index_procedure
-#     raise ArgumentError, "index name should be: dyn_col_id_md5_hash_of_selector and truncated to a length of 63"
-#     raise ArgumentError, "it should only create 1 index and not multiple"
-
-
-#     # CREATE INDEX CONCURRENTLY post_json_documents_body_age ON post_json_documents(json_selector('age', body))
-# "CREATE OR REPLACE FUNCTION ensure_dynamic_index(selectors text, collection_id text) RETURNS json AS $$
-#   var show_indexes = plv8.find_function('show_indexes');
-#   var colId = collection_id.replace('-', '');
-#   var indexPrefix = 'col_' + colId + '_';
-#   var existingIndexes = show_indexes('post_json_documents', indexPrefix).map(function(row) { return row.index; });
-#   var selectorArray = selectors.replace(/\s+/g, '').split(',');
-
-#   var indexes = selectorArray.map(function(selector) { return {'name': indexPrefix + selector.replace('.', '_'), selector: selector}; });
-#   var newIndexes = indexes.filter(function(index) { return existingIndexes.indexOf(index.name) == -1; });
-
-#   newIndexes.forEach(function(index) {
-#     var sql = \"CREATE INDEX \" + index.name + \" ON post_json_documents(json_selector('\" + index.selector + \"', body)) WHERE collection_id = '\" + colId + \"';\"
-#     plv8.execute( sql );      
-#   });
-
-#   return newIndexes;
-# $$ LANGUAGE plv8 IMMUTABLE STRICT;"
-#   end
+  def show_indexes_procedure
+"CREATE OR REPLACE FUNCTION show_indexes(table_name text DEFAULT '', index_prefix text DEFAULT '') RETURNS json AS $$
+  var show_all_indexes = plv8.find_function('show_all_indexes');
+  var indexes = show_all_indexes();
+  if (0 < (table_name || '').length) {
+    indexes = indexes.filter(function(row) { return row['table'] === table_name; });
+  }
+  if (0 < (index_prefix || '').length) {
+    indexes = indexes.filter(function(row) { return row['index'].lastIndexOf(index_prefix, 0) === 0; });
+  }
+  return indexes;
+$$ LANGUAGE plv8 IMMUTABLE STRICT;"
+  end
 end

data/spec/dummy/db/structure.sql

@@ -161,29 +161,28 @@ CREATE FUNCTION show_all_indexes() RETURNS json
     $$;
 
 
-SET default_tablespace = '';
-
-SET default_with_oids = false;
-
 --
--- Name: post_json_collections; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+-- Name: show_indexes(text, text); Type: FUNCTION; Schema: public; Owner: -
 --
 
-CREATE TABLE post_json_collections (
-    id uuid DEFAULT uuid_generate_v4() NOT NULL,
-    name text,
-    meta json,
-    use_timestamps boolean DEFAULT true,
-    created_at_attribute_name text DEFAULT 'created_at'::text NOT NULL,
-    updated_at_attribute_name text DEFAULT 'updated_at'::text NOT NULL,
-    use_version_number boolean DEFAULT true,
-    version_attribute_name text DEFAULT 'version'::text NOT NULL,
-    use_dynamic_index boolean DEFAULT true,
-    create_dynamic_index_milliseconds_threshold integer DEFAULT 50,
-    created_at timestamp without time zone,
-    updated_at timestamp without time zone
-);
+CREATE FUNCTION show_indexes(table_name text DEFAULT ''::text, index_prefix text DEFAULT ''::text) RETURNS json
+    LANGUAGE plv8 IMMUTABLE STRICT
+    AS $$
+  var show_all_indexes = plv8.find_function('show_all_indexes');
+  var indexes = show_all_indexes();
+  if (0 < (table_name || '').length) {
+    indexes = indexes.filter(function(row) { return row['table'] === table_name; });
+  }
+  if (0 < (index_prefix || '').length) {
+    indexes = indexes.filter(function(row) { return row['index'].lastIndexOf(index_prefix, 0) === 0; });
+  }
+  return indexes;
+$$;
+
+
+SET default_tablespace = '';
 
+SET default_with_oids = false;
 
 --
 -- Name: post_json_documents; Type: TABLE; Schema: public; Owner: -; Tablespace: 
@@ -239,14 +238,6 @@ CREATE TABLE schema_migrations (
 );
 
 
---
--- Name: post_json_collections_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
---
-
-ALTER TABLE ONLY post_json_collections
-    ADD CONSTRAINT post_json_collections_pkey PRIMARY KEY (id);
-
-
 --
 -- Name: post_json_documents_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -298,14 +289,12 @@ CREATE UNIQUE INDEX unique_schema_migrations ON schema_migrations USING btree (v
 
 SET search_path TO "$user",public;
 
-INSERT INTO schema_migrations (version) VALUES ('20131015022029');
-
-INSERT INTO schema_migrations (version) VALUES ('20131015022030');
+INSERT INTO schema_migrations (version) VALUES ('20131018135639');
 
-INSERT INTO schema_migrations (version) VALUES ('20131015022031');
+INSERT INTO schema_migrations (version) VALUES ('20131018135640');
 
-INSERT INTO schema_migrations (version) VALUES ('20131015022032');
+INSERT INTO schema_migrations (version) VALUES ('20131018135641');
 
-INSERT INTO schema_migrations (version) VALUES ('20131015022033');
+INSERT INTO schema_migrations (version) VALUES ('20131018135642');
 
-INSERT INTO schema_migrations (version) VALUES ('20131015022034');
+INSERT INTO schema_migrations (version) VALUES ('20131018135643');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: post_json
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Jacob Madsen and Martin Thoegersen
@@ -146,12 +146,11 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/422.html
 - spec/dummy/db/structure.sql
-- spec/dummy/db/migrate/20131015022029_enable_extensions.rb
-- spec/dummy/db/migrate/20131015022031_create_post_json_model_settings.rb
-- spec/dummy/db/migrate/20131015022030_create_procedures.rb
-- spec/dummy/db/migrate/20131015022034_create_post_json_dynamic_indexes.rb
-- spec/dummy/db/migrate/20131015022032_create_post_json_collections.rb
-- spec/dummy/db/migrate/20131015022033_create_post_json_documents.rb
+- spec/dummy/db/migrate/20131018135641_create_post_json_model_settings.rb
+- spec/dummy/db/migrate/20131018135643_create_post_json_dynamic_indexes.rb
+- spec/dummy/db/migrate/20131018135639_enable_extensions.rb
+- spec/dummy/db/migrate/20131018135640_create_procedures.rb
+- spec/dummy/db/migrate/20131018135642_create_post_json_documents.rb
 - spec/modules/query_methods_spec.rb
 - spec/modules/argument_methods_spec.rb
 - MIT-LICENSE

data/spec/dummy/db/migrate/20131015022029_enable_extensions.rb

@@ -1,28 +0,0 @@
-class EnableExtensions < ActiveRecord::Migration
-  def change
-    # Install Postgresql 9.2 with PLV8 (might require )
-    # 1. sudo add-apt-repository ppa:pitti/postgresql 
-    # 2. sudo apt-get update
-    # 3. sudo apt-get install postgresql-9.2 postgresql-contrib-9.2 postgresql-server-dev-9.2 libv8-dev
-    # 4. sudo su - postgres
-    # 5. Enter psql and run "CREATE USER webnuts WITH PASSWORD 'webnuts';" and "ALTER USER webnuts CREATEDB;" and "ALTER USER webnuts SUPERUSER;"
-    # 6. git clone https://code.google.com/p/plv8js/
-    # 7. cd plv8js
-    # 8. make
-    # 9. sudo make install
-
-    # bundle exec rake db:create:all
-    # bundle exec rake db:migrate
-    # bundle exec rake db:test:prepare
-
-    # See all available extensions:
-    # ActiveRecord::Base.connection.execute("select * from pg_available_extensions;").each_row do |row|
-    #   puts row.to_s
-    # end
-
-    enable_extension 'uuid-ossp'  # generate universally unique identifiers (UUIDs)
-    enable_extension 'hstore'     # data type for storing sets of (key, value) pairs
-    enable_extension 'plv8'       # PL/JavaScript (v8) trusted procedural language
-    #enable_extension 'plcoffee'   # PL/CoffeeScript (v8) trusted procedural language
-  end
-end

data/spec/dummy/db/migrate/20131015022032_create_post_json_collections.rb

@@ -1,16 +0,0 @@
-class CreatePostJsonCollections < ActiveRecord::Migration
-  def change
-    create_table :post_json_collections, id: :uuid do |t|
-      t.text :name, index: true, unique: true
-      t.json :meta
-      t.boolean :use_timestamps, default: true
-      t.text :created_at_attribute_name, default: 'created_at', null: false
-      t.text :updated_at_attribute_name, default: 'updated_at', null: false
-      t.boolean :use_version_number, default: true
-      t.text :version_attribute_name, default: 'version', null: false
-      t.boolean :use_dynamic_index, default: true
-      t.integer :create_dynamic_index_milliseconds_threshold, default: 50
-      t.timestamps
-    end
-  end
-end