uuidify 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 380fb482f0d0a03a34f56eef56396fb22da0ea73
-  data.tar.gz: 2430fe027e8b2ac8a1f240db26a61f3392fc027c
+  metadata.gz: ad1332e0ef93f7cd6cc689db3942250db14b5fd5
+  data.tar.gz: 3aa98ffc9153120ff02049e02761ab1bfb846965
 SHA512:
-  metadata.gz: ded454c7bb0eb31f985d539fab2c3da9f99f65b0a2f7160967ff94f3bf92b9cd48608ad330842eae21ef1bcb501d9b2002a516c1f81bbdda905f5504b8400c22
-  data.tar.gz: aa8e8008e167ed87af4f9f2473956f807ed93db11aa6184e2d484735e62ee27508639c1d2495d0d89e941f938c80600234a6fbfdc1e29fe65a11d16b95f67087
+  metadata.gz: 801f0d9e6535a1b895a3d1fc2253276fb427737acfee1fe238807768c5c4c1b2f3da0795ee217d56a90a108b76051330f5ecbd8839c15c09af273691e04c4fcb
+  data.tar.gz: 7e21d98183818adca0f05bf6157ee476486954e1326437c20f9e2f246baf34e7b84b7ac84e03bbcd215f458892b598722a2a3a74d47d0cb0126098a0c57cef34

checksums.yaml.gz.asc

@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABCgAGBQJSqHy3AAoJEP5F5V2hilTWmDIH/A4HikYutQEudAdnql3Os3s1
-02RBQB5sa+iQ9smiBsXaGI1DohUp4a1T+WEQNynq7eZ1NFk65G+4Od3ay6t+uCpN
-FANqv9H8eO1mrccCEuxoF3sGUJdUZ5komsSS5nxo4sUumKZTIvx4zYvLRl6NAkQo
-OlaTa5jcQ3Y/noGNg53V6GqFkPHNDrTVnnxw9aFu0WhORwuaWCjoKoQMNU59BG5j
-cpHQmUo7qESGN0u2WBo6YrY4wpbIHJ5ZlJYR3OxHWsCjuV2i2p+DTyxzcAF15efG
-RgU4jkKbYVDmtkXAlhKxwCN2aTsiDOg6+feLczyeAbGDyUhrGXU4BsWL/Cdf16s=
-=QCJ8
+iQEcBAABCgAGBQJTFflsAAoJEP5F5V2hilTWplAIAKgAOf+dkZttPSLKrlHvKE5Q
+OCJ15E2vQtQ+pSHC3oqJOWZ7AXTJwgdPfNO76SareiVxcJTJow4S/t10RfFaxbtd
+FcJg0v+3zUW+OsIugZo5ekoG5MgGMPk6ZozPZ+cY+3CFeTO1hOwEwC2JvJaxzoB7
+7l9WEVcxVQw7/wbbQZRdW+xzey5lyfECg4XQnnJAcLlScI4SrK56fux9czPrjlJu
+6/auajj5vGhpyjd6fZRQ92qFTOW4+UcBw2veXG54ONUrqKIfQyD7pWkYtVMfW7Ol
+uX1wIHUlrlwuUz4j9ZEfREyUXzgMzoOMuwDul2mxUropS2QTpsRuqJ8v/1yyDQI=
+=54FE
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.19 (Darwin)
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABCgAGBQJSqHy3AAoJEP5F5V2hilTWoOoH/AsWUntuV4JGJPOmnOpTGnQh
-ZU/ocGk6gbBqSPgXRcDfCkMS6xuiQ/v131PUyFD3So7FUIMaN4MyEJwKhfCfrDPk
-eFWRmHuy/N/wJhJwcZZzbhXEUEaTZ8nnw5DMSXG8iJlCDzST3UvMx0m2rQ7q1It0
-SuWFfNdrwnXgrY5lT2Mg908SjdcpeSbwtQsPTmBzGBIL4GXv9rl9x0h9AobkH4gs
-mDKDtAv1mXDv6aMMbblh8oekRKEoApH+BBvh6LCGm3LVseFpD+WccRLELzzo1FAI
-/ZUJGLCGJMbej+XW9RrawSIBdpuAKZNIyJzmfzEqr+cHIFsexRc24r5Ss0CwZpo=
-=8iBy
+iQEcBAABCgAGBQJTFflsAAoJEP5F5V2hilTWwGcH/1Kv3WxzodvqlWOaQEaePvwa
+flwInVvAtnps4ySTzdtORvUeMzsjgR7JESLpbOBvXBrv51HTatRwXlIgWxNymg1Y
+JkTo+LvWG5n6hoR6vsd67q/yc2gmIHm69J70RlwzF8WsNKIHprj6GyeqWP71RRsN
+CseIfcSyVoDjJ7c98tSgp8N+j395+i3uMfJ5WIMSrrfy9Lch0otWazn7oAKhEi5g
+J3vbN73dm1NMZHTo4BrjlkaYWnOS06zfKV4r/9gi6hmNqlEixAGaqyzMzlgkrwop
+7cRN81fP6b1Ou6o3M0BpPJeTRBq/YNAmIQ2epyExhKrTWvGC6K7ncZvlT6Vpw64=
+=x0Cc
 -----END PGP SIGNATURE-----

data/app/models/uuidify/uuid.rb

@@ -3,4 +3,25 @@ class Uuidify::Uuid < ActiveRecord::Base
   if Rails::VERSION::MAJOR == 3
     attr_accessible :model_name, :model_id, :model_uuid
   end
+
+  def self.uuid_storage_type
+    connection.adapter_name == "PostgreSQL" ? :string : :binary
+  end
+  
+  def self.uuid_to_sql_string uuid
+    if uuid_storage_type == :string
+      uuid.to_s
+    else
+      uuid.raw
+    end
+  end
+
+  def self.uuid_from_sql_string string
+    if uuid_storage_type == :string
+      UUIDTools::UUID.parse(string)
+    else
+      UUIDTools::UUID.parse_raw(string)
+    end
+  end
+  
 end

data/db/migrate/20130612143347_create_uuidify_uuids.rb

@@ -1,12 +1,21 @@
 class CreateUuidifyUuids < ActiveRecord::Migration
   def up
+    uuid_type = connection.adapter_name == "PostgreSQL" ? :string : :binary
+
     create_table :uuidify_uuids do |t|
       t.string :model_name
       t.integer :model_id
-#      t.string :model_uuid, :limit => 36
+
+      if uuid_type == :string
+        t.string :model_uuid, :limit => 36
+      end
+      
     end
-    
-    execute "ALTER TABLE uuidify_uuids ADD COLUMN model_uuid BINARY(16)"
+
+    if uuid_type == :binary
+      execute "ALTER TABLE uuidify_uuids ADD COLUMN model_uuid BINARY(16)"
+    end
+
     add_index :uuidify_uuids, [:model_name, :model_id], :unique => true
     add_index :uuidify_uuids, :model_uuid, :unique => true
     add_index :uuidify_uuids, [:model_uuid, :model_id], :unique => true

data/lib/uuidify/uuidify_concern.rb

@@ -19,7 +19,9 @@ module Uuidify::UuidifyConcern
   module ClassMethods
     # .find_by_uuid.  Used lookup so we know it's not rails magic.
     def lookup_uuid(uuid)
-      uuid = Uuidify::Uuid.where(:model_uuid => uuid.raw, :model_name => self.to_s).first
+      uuid = Uuidify::Uuid.uuid_to_sql_string(uuid)
+      
+      uuid = Uuidify::Uuid.where(:model_uuid => uuid, :model_name => self.to_s).first
       uuid ? find(uuid.model_id) : nil
     end
 
@@ -31,6 +33,8 @@ module Uuidify::UuidifyConcern
         end
       end
     end
+
+
   end
 
   # Return a UUID, creating it if needed.
@@ -43,18 +47,24 @@ module Uuidify::UuidifyConcern
     uuid = Uuidify::Uuid.where(:model_name => model_name, :model_id => model_id).first
 
     if uuid.nil?
-      new_uuid = UUIDTools::UUID.timestamp_create.raw
+      new_uuid = UUIDTools::UUID.timestamp_create
+      new_uuid = Uuidify::Uuid.uuid_to_sql_string(new_uuid)
+
       uuid = Uuidify::Uuid.create(:model_name => model_name, :model_id => self.id, :model_uuid => new_uuid)
       uuid.save!
     end
 
-    UUIDTools::UUID.parse_raw(uuid.model_uuid)
+    Uuidify::Uuid.uuid_from_sql_string(uuid.model_uuid)
   end
 
+
   # Assign a UUID that came from an external source.
   def uuid= new_uuid
     abort_if_unsaved!
-    Uuidify::Uuid.where(:model_name => self.class.to_s, :model_id => self.id).first_or_create!.update_column(:model_uuid, new_uuid.raw)
+
+    uuid_value = Uuidify::Uuid.uuid_to_sql_string(new_uuid)
+    
+    Uuidify::Uuid.where(:model_name => self.class.to_s, :model_id => self.id).first_or_create!.update_column(:model_uuid, uuid_value)
   end
   
   private

data/lib/uuidify/version.rb

@@ -1,3 +1,3 @@
 module Uuidify
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/uuidify/version.rb~

@@ -1,3 +1,3 @@
 module Uuidify
-  VERSION = "0.4.0.pre"
+  VERSION = "0.4.0"
 end

data/spec/dummy/config/database.yml

@@ -1,14 +1,34 @@
+# development:
+#   adapter: mysql2
+#   host: 127.0.0.1
+#   database: uuidify_dev
+#   username: root
+#   pool: 5
+#   timeout: 5000
+
+# test:
+#   adapter: mysql2
+#   host: 127.0.0.1
+#   database: uuidify_test
+#   username: root
+#   pool: 5
+#   timeout: 5000
+
 development:
-  adapter: mysql2
-  database: guidify
-  user: root
+  adapter: postgresql
+  host: 127.0.0.1
+  database: uuidify_dev
+  username: postgres
+  password: 0R3EhgbYBBJE4KMK
   pool: 5
   timeout: 5000
 
 test:
-  adapter: mysql2
-  database: guidify_test
-  user: root
+  adapter: postgresql
+  host: 127.0.0.1
+  database: uuidify_test
+  username: postgres
+  password: 0R3EhgbYBBJE4KMK
   pool: 5
   timeout: 5000
 

data/spec/dummy/config/database.yml~

@@ -0,0 +1,18 @@
+development:
+  adapter: postgresql
+  host: 127.0.0.1
+  database: uuidify_dev
+  username: postgres
+  password: 0R3EhgbYBBJE4KMK
+  pool: 5
+  timeout: 5000
+
+test:
+  adapter: postgresql
+  host: 127.0.0.1
+  database: uuidify_test
+  username: postgres
+  password: 0R3EhgbYBBJE4KMK
+  pool: 5
+  timeout: 5000
+

data/spec/dummy/db/structure.sql

@@ -1,32 +1,210 @@
-CREATE TABLE `bars` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-CREATE TABLE `foos` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `created_at` datetime NOT NULL,
-  `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-CREATE TABLE `schema_migrations` (
-  `version` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  UNIQUE KEY `unique_schema_migrations` (`version`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-
-CREATE TABLE `uuidify_uuids` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `model_name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_id` int(11) DEFAULT NULL,
-  `model_uuid` binary(16) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `index_uuidify_uuids_on_model_name_and_model_id` (`model_name`,`model_id`),
-  UNIQUE KEY `index_uuidify_uuids_on_model_uuid` (`model_uuid`),
-  UNIQUE KEY `index_uuidify_uuids_on_model_uuid_and_model_id` (`model_uuid`,`model_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+--
+-- PostgreSQL database dump
+--
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+
+--
+-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
+
+
+--
+-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
+
+
+SET search_path = public, pg_catalog;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- Name: bars; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE bars (
+    id integer NOT NULL,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: bars_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE bars_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: bars_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE bars_id_seq OWNED BY bars.id;
+
+
+--
+-- Name: foos; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE foos (
+    id integer NOT NULL,
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: foos_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE foos_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: foos_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE foos_id_seq OWNED BY foos.id;
+
+
+--
+-- Name: schema_migrations; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE schema_migrations (
+    version character varying(255) NOT NULL
+);
+
+
+--
+-- Name: uuidify_uuids; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE uuidify_uuids (
+    id integer NOT NULL,
+    model_name character varying(255),
+    model_id integer,
+    model_uuid character varying(36)
+);
+
+
+--
+-- Name: uuidify_uuids_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE uuidify_uuids_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: uuidify_uuids_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE uuidify_uuids_id_seq OWNED BY uuidify_uuids.id;
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY bars ALTER COLUMN id SET DEFAULT nextval('bars_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY foos ALTER COLUMN id SET DEFAULT nextval('foos_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY uuidify_uuids ALTER COLUMN id SET DEFAULT nextval('uuidify_uuids_id_seq'::regclass);
+
+
+--
+-- Name: bars_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY bars
+    ADD CONSTRAINT bars_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: foos_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY foos
+    ADD CONSTRAINT foos_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: uuidify_uuids_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY uuidify_uuids
+    ADD CONSTRAINT uuidify_uuids_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: index_uuidify_uuids_on_model_name_and_model_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX index_uuidify_uuids_on_model_name_and_model_id ON uuidify_uuids USING btree (model_name, model_id);
+
+
+--
+-- Name: index_uuidify_uuids_on_model_uuid; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX index_uuidify_uuids_on_model_uuid ON uuidify_uuids USING btree (model_uuid);
+
+
+--
+-- Name: index_uuidify_uuids_on_model_uuid_and_model_id; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX index_uuidify_uuids_on_model_uuid_and_model_id ON uuidify_uuids USING btree (model_uuid, model_id);
+
+
+--
+-- Name: unique_schema_migrations; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX unique_schema_migrations ON schema_migrations USING btree (version);
+
+
+--
+-- PostgreSQL database dump complete
+--
 
 INSERT INTO schema_migrations (version) VALUES ('20130612135708');