easy_orderable 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a4f7e80bf010be7f63cb3abe11932fb6ed8089
-  data.tar.gz: 15635b6bcece75b05c0107c2a8004787cab26eed
+  metadata.gz: 4eada5c0b4316f63cf8b707fc376491417229fb2
+  data.tar.gz: ece2914966aed6814f6738849773e8690b67518d
 SHA512:
-  metadata.gz: c4e477d87c2761a4563d957ac2ac9c5cd66747b20b9e4b8ccc4da84727e90f290745452aaa8f3361503f33cc8d3c6847946dce3f2d573a7c7ac3a434d53a3bed
-  data.tar.gz: 451218c1355be0b9682331f5ae9b641fb53f081918bca309c9357e46da3bc5dfc2d297a026f15b033cf26d388f145ac076ac4fc0f83819eded25b8d90d6939dc
+  metadata.gz: 945107acac61f88938172da23935ac44375eeeb24fd856420170434a750143270022fa576e747e5e5886751296869314ad2367ccbe783fd8110525c3c01eab79
+  data.tar.gz: 154dbf850ec4445332e5434e3d6c005f82809412e9f3a0bc96260097d46d24be0eb87c2bcc3a604ae84cc172fa991ecb113e9f1faf7c5f8c4de32b6d4951b9b8

data/lib/easy_orderable/joiner.rb

@@ -16,7 +16,7 @@ module EasyOrderable
 
     def association_names
       table_names.map do |name|
-        if custom_association_names && custom_association_names.keys.include?(name.to_sym)
+        if custom_association_names && custom_association_names.key?(name.to_sym)
           custom_association_names[name.to_sym].to_sym
         else
           name.to_sym

data/lib/easy_orderable/order_arguments_transformer.rb

@@ -5,12 +5,12 @@ module EasyOrderable
     end
 
     def call
-      args.to_a.map do |e|
-        if e.first.include?('.')
-          table_name, column_name = e.first.split('.')
-          "#{table_name.pluralize}.#{column_name} #{e.second}"
+      args.map do |association, direction|
+        if association.include?('.')
+          table_name, column_name = association.split('.')
+          "#{quote(table_name.pluralize)}.#{quote(column_name)} #{direction}"
         else
-          "#{e.first} #{e.second}"
+          "#{quote(association)} #{direction}"
         end
       end
     end
@@ -18,5 +18,9 @@ module EasyOrderable
     private
 
     attr_reader :args
+
+    def quote(name)
+      ActiveRecord::Base.connection.quote_column_name(name)
+    end
   end
 end

data/lib/easy_orderable/version.rb

@@ -1,3 +1,3 @@
 module EasyOrderable
-  VERSION = '0.1.0'
+  VERSION = '0.2.2'
 end

data/spec/dummy/log/development.log

@@ -0,0 +1,80 @@
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  begin transaction
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.0ms)  commit transaction
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+  ActiveRecord::InternalMetadata Load (0.2ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  begin transaction
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.0ms)  commit transaction
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.2ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "environment"]]
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "environment"]]
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ?  [["key", "environment"]]
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.1ms)  DROP TABLE IF EXISTS "bookings"
+  ↳ db/schema.rb:15
+   (0.2ms)  SELECT sqlite_version(*)
+  ↳ db/schema.rb:15
+   (1.1ms)  CREATE TABLE "bookings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "slots_count" integer, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+  ↳ db/schema.rb:15
+   (0.9ms)  CREATE  INDEX "index_bookings_on_user_id" ON "bookings" ("user_id")
+  ↳ db/schema.rb:15
+   (0.1ms)  DROP TABLE IF EXISTS "requests"
+  ↳ db/schema.rb:23
+   (0.9ms)  CREATE TABLE "requests" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "description" varchar, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+  ↳ db/schema.rb:23
+   (0.9ms)  CREATE  INDEX "index_requests_on_user_id" ON "requests" ("user_id")
+  ↳ db/schema.rb:23
+   (0.1ms)  DROP TABLE IF EXISTS "users"
+  ↳ db/schema.rb:31
+   (0.9ms)  CREATE TABLE "users" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+  ↳ db/schema.rb:31
+   (1.0ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
+  ↳ db/schema.rb:13
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
+  ↳ db/schema.rb:13
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES (20181213104620)
+  ↳ db/schema.rb:13
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES
+(20181213104543),
+(20181213104420);
+
+
+  ↳ db/schema.rb:13
+   (1.0ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
+  ↳ db/schema.rb:13
+  ActiveRecord::InternalMetadata Load (0.3ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  ↳ db/schema.rb:13
+   (0.0ms)  begin transaction
+  ↳ db/schema.rb:13
+  ActiveRecord::InternalMetadata Create (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "development"], ["created_at", "2019-01-21 10:03:34.308090"], ["updated_at", "2019-01-21 10:03:34.308090"]]
+  ↳ db/schema.rb:13
+   (0.7ms)  commit transaction
+  ↳ db/schema.rb:13
+  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.0ms)  begin transaction
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+  ActiveRecord::InternalMetadata Update (0.3ms)  UPDATE "ar_internal_metadata" SET "value" = ?, "updated_at" = ? WHERE "ar_internal_metadata"."key" = ?  [["value", "test"], ["updated_at", "2019-01-21 10:03:34.312471"], ["key", "environment"]]
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22
+   (0.6ms)  commit transaction
+  ↳ /Users/filip/.rbenv/versions/2.3.7/bin/rake:22